Commit 140c9164 authored Feb 20, 2006 by unknown

post-merge fixes.

parent b14a6af8

mysql-test/r/binlog_row_mix_innodb_myisam.result

+2 −2

Original line number	Diff line number	Diff line
		@@ -294,9 +294,9 @@ select get_lock("a",10);
		get_lock("a",10)
		1
		select
		(@a:=load_file("MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))
		(@a:=load_file("MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
		is not null;
		(@a:=load_file("MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))
		(@a:=load_file("MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
		is not null
		1
		select

mysql-test/t/binlog_row_mix_innodb_myisam.test

+3 −3

Original line number	Diff line number	Diff line
		@@ -11,10 +11,10 @@
		# we check that the error code of the "ROLLBACK" event is 0 and not
		# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
		# and does not make slave to stop)
		--exec $MYSQL_BINLOG --start-position=516 $MYSQL_TEST_DIR/var/log/master-bin.000001 > var/tmp/mix_innodb_myisam_binlog.output
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
		--exec $MYSQL_BINLOG --start-position=516 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
		--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
		eval select
		(@a:=load_file("$MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))
		(@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
		is not null;
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
		eval select

mysql-test/t/binlog_stm_mix_innodb_myisam.test

+3 −3

Original line number	Diff line number	Diff line
		@@ -11,10 +11,10 @@
		# we check that the error code of the "ROLLBACK" event is 0 and not
		# ER_SERVER_SHUTDOWN (i.e. disconnection just rolls back transaction
		# and does not make slave to stop)
		--exec $MYSQL_BINLOG --start-position=551 $MYSQL_TEST_DIR/var/log/master-bin.000001 > var/tmp/mix_innodb_myisam_binlog.output
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
		--exec $MYSQL_BINLOG --start-position=551 $MYSQLTEST_VARDIR/log/master-bin.000001 > $MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output
		--replace_result $MYSQLTEST_VARDIR MYSQLTEST_VARDIR
		eval select
		(@a:=load_file("$MYSQL_TEST_DIR/var/tmp/mix_innodb_myisam_binlog.output"))
		(@a:=load_file("$MYSQLTEST_VARDIR/tmp/mix_innodb_myisam_binlog.output"))
		is not null;
		--replace_result $MYSQL_TEST_DIR MYSQL_TEST_DIR
		eval select