Commit 2c371ec7 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/usr/local/mysql/mysql-5.0-fixtest 

into  mysql.com:/usr/local/mysql/mysql-5.0
parents f37ebdb2 8aac108d

mysql-test/r/mix_innodb_myisam_binlog.result

+2 −2
Original line number Diff line number Diff line
@@ -269,9 +269,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/mix_innodb_myisam_binlog.test

+3 −3
Original line number Diff line number Diff line
@@ -283,10 +283,10 @@ select get_lock("a",10); # wait for rollback to finish 
# 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=547 $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=547 $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