fixed the race condition in the test case for BUG#7947

1 files changed, 5 insertions, 3 deletions

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;