From eac88b685ca40d4cfccf299c1b39f1663acdb8f1 Mon Sep 17 00:00:00 2001 From: "sasha@asksasha.com" <> Date: Wed, 16 Nov 2005 21:17:38 -0700 Subject: [PATCH] fixed the race condition in the test case for BUG#7947 --- mysql-test/r/mix_innodb_myisam_binlog.result | 8 +++++--- mysql-test/t/mix_innodb_myisam_binlog.test | 8 +++++--- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result index a586ad93ce4..e9613bac833 100644 --- a/mysql-test/r/mix_innodb_myisam_binlog.result +++ b/mysql-test/r/mix_innodb_myisam_binlog.result @@ -222,9 +222,9 @@ insert into t0 select GET_LOCK("lock1",null); set autocommit=0; create table t2 (n int) engine=innodb; insert into t2 values (3); -select get_lock("lock1",null); -get_lock("lock1",null) -0 +select get_lock("lock1",60); +get_lock("lock1",60) +1 show binlog events from 79; Log_name Pos Event_type Server_id Orig_log_pos Info master-bin.000001 79 Query 1 79 use `test`; BEGIN @@ -249,5 +249,7 @@ master-bin.000001 1056 Query 1 1056 use `test`; insert t0 select * from t1 master-bin.000001 1117 Query 1 1117 use `test`; DO RELEASE_LOCK("a") master-bin.000001 1172 Query 1 1172 use `test`; insert into t0 select GET_LOCK("lock1",null) master-bin.000001 1251 Query 1 1251 use `test`; create table t2 (n int) engine=innodb +master-bin.000001 1323 Query 1 1323 use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti` +master-bin.000001 1424 Query 1 1424 use `test`; DO RELEASE_LOCK("lock1") do release_lock("lock1"); drop table t0,t2; diff --git a/mysql-test/t/mix_innodb_myisam_binlog.test b/mysql-test/t/mix_innodb_myisam_binlog.test index a25ab9c368e..4581736ac8c 100644 --- a/mysql-test/t/mix_innodb_myisam_binlog.test +++ b/mysql-test/t/mix_innodb_myisam_binlog.test @@ -218,8 +218,10 @@ create temporary table ti (a int) engine=innodb; rollback; insert into ti values(1); set autocommit=0; -create temporary table t1 (a int) engine=myisam; commit; -insert t1 values (1); rollback; +create temporary table t1 (a int) engine=myisam; +commit; +insert t1 values (1); +rollback; create table t0 (n int); insert t0 select * from t1; set autocommit=1; @@ -229,7 +231,7 @@ create table t2 (n int) engine=innodb; insert into t2 values (3); disconnect con2; connection con3; -select get_lock("lock1",null); +select get_lock("lock1",60); show binlog events from 79; do release_lock("lock1"); drop table t0,t2;