1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

rpl_row_tabledefs_2myisam.result:

merged 5.1-main to 5.1-opt : error numbers changed.
Many files:
   merged 5.1-main to 5.1-opt : error numbers changed
rpl_extraCol_innodb.result:
  merged 5.1-main to 5.1-opt : error numbers changed


mysql-test/suite/rpl/r/rpl_extraCol_innodb.result:
  merged 5.1-main to 5.1-opt : error numbers changed
mysql-test/suite/rpl/r/rpl_extraCol_myisam.result:
   merged 5.1-main to 5.1-opt : error numbers changed
mysql-test/suite/rpl/r/rpl_incident.result:
   merged 5.1-main to 5.1-opt : error numbers changed
mysql-test/suite/rpl/r/rpl_loaddata_fatal.result:
   merged 5.1-main to 5.1-opt : error numbers changed
mysql-test/suite/rpl/r/rpl_row_tabledefs_2myisam.result:
   merged 5.1-main to 5.1-opt : error numbers changed.
mysql-test/suite/rpl/r/rpl_row_tabledefs_3innodb.result:
   merged 5.1-main to 5.1-opt : error numbers changed
mysql-test/suite/rpl_ndb/r/rpl_ndb_extraCol.result:
   merged 5.1-main to 5.1-opt : error numbers changed
This commit is contained in:
unknown
2007-08-05 14:02:33 +03:00
parent 03e379d36f
commit 5807eb18b8
7 changed files with 58 additions and 58 deletions

View File

@ -65,7 +65,7 @@ Replicate_Do_Table
Replicate_Ignore_Table #
Replicate_Wild_Do_Table
Replicate_Wild_Ignore_Table
Last_Errno 1590
Last_Errno 1591
Last_Error Fatal error: Not enough memory
Skip_Counter 0
Exec_Master_Log_Pos 325
@ -83,7 +83,7 @@ Seconds_Behind_Master #
Master_SSL_Verify_Server_Cert No
Last_IO_Errno #
Last_IO_Error #
Last_SQL_Errno 1590
Last_SQL_Errno 1591
Last_SQL_Error Fatal error: Not enough memory
SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
START SLAVE;