Commit 8d2b5f13 authored Dec 11, 2006 by unknown

after merge fix for bug N20396

parent d9993548

mysql-test/r/binlog_row_mix_innodb_myisam.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -407,8 +407,8 @@ is not null;
		is not null
		1
		select
		@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",
		@a like "%#%error_code=0%ROLLBACK/!/;%ROLLBACK /* added by mysqlbinlog */;%",
		@a not like "%#%error_code=%error_code=%";
		@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%" @a not like "%#%error_code=%error_code=%"
		@a like "%#%error_code=0%ROLLBACK/!/;%ROLLBACK /* added by mysqlbinlog */;%" @a not like "%#%error_code=%error_code=%"
		1 1
		drop table t1, t2;

mysql-test/t/binlog_row_mix_innodb_myisam.test

+1 −1

Original line number	Diff line number	Diff line
		@@ -26,6 +26,6 @@ eval select
		is not null;
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
		eval select
		@a like "%#%error_code=0%ROLLBACK;%ROLLBACK /* added by mysqlbinlog */;%",
		@a like "%#%error_code=0%ROLLBACK/!/;%ROLLBACK /* added by mysqlbinlog */;%",
		@a not like "%#%error_code=%error_code=%";
		drop table t1, t2;