Commit 7d557fbc authored by unknown's avatar unknown
Browse files

Test case fixes 


mysql-test/r/rpl_row_tabledefs_2myisam.result:
  Change error code of new error
mysql-test/r/rpl_switch_stm_row_mixed.result:
  Change of result file
mysql-test/t/mysqldump.test:
  incorrect merge
parent 0cdbe2c3

mysql-test/r/rpl_row_tabledefs_2myisam.result

+4 −4
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1514

Last_Errno	1522

Last_Error	Table width mismatch - received 2 columns, test.t2 has 1 columns

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -189,7 +189,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1514

Last_Errno	1522

Last_Error	Column 0 type mismatch - received type 3, test.t4 has type 4

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -227,7 +227,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1514

Last_Errno	1522

Last_Error	Column 1 type mismatch - received type 3, test.t5 has type 4

Skip_Counter	0

Exec_Master_Log_Pos	#
@@ -265,7 +265,7 @@ Replicate_Do_Table 
Replicate_Ignore_Table	

Replicate_Wild_Do_Table	

Replicate_Wild_Ignore_Table	

Last_Errno	1514

Last_Errno	1522

Last_Error	Column 2 type mismatch - received type 3, test.t6 has type 4

Skip_Counter	0

Exec_Master_Log_Pos	#

mysql-test/r/rpl_switch_stm_row_mixed.result

+1 −1
Original line number Diff line number Diff line
@@ -750,7 +750,7 @@ master-bin.000001 # Query 1 # use `mysqltest1`; CREATE TABLE `t2` ( 
master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t2)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

master-bin.000001	#	Query	1	#	use `mysqltest1`; CREATE TABLE `t3` (

  `1` varbinary(108) NOT NULL DEFAULT ''

  `1` varbinary(36) NOT NULL DEFAULT ''

)

master-bin.000001	#	Table_map	1	#	table_id: # (mysqltest1.t3)

master-bin.000001	#	Write_rows	1	#	table_id: # flags: STMT_END_F

mysql-test/t/mysqldump.test

+0 −1
Original line number Diff line number Diff line
@@ -835,7 +835,6 @@ use test; 
--echo # Dump of view

--echo #



>>>>>>>

create table t1(a int);

create view v1 as select * from t1;

--exec $MYSQL_DUMP --skip-comments test