diff options
| author | unknown <sasha@asksasha.com> | 2005-11-16 21:17:38 -0700 |
|---|---|---|
| committer | unknown <sasha@asksasha.com> | 2005-11-16 21:17:38 -0700 |
| commit | 4d93df791452162f4ed54a4eb44178f1892b41ba (patch) | |
| tree | deb36cf8c18f9260ac53427373084df6f0bab2e3 /mysql-test/r/mix_innodb_myisam_binlog.result | |
| parent | 19809fab2d378968b0660abbb67d0d459e25e607 (diff) | |
| download | mariadb-git-4d93df791452162f4ed54a4eb44178f1892b41ba.tar.gz | |
fixed the race condition in the test case for BUG#7947
Diffstat (limited to 'mysql-test/r/mix_innodb_myisam_binlog.result')
| -rw-r--r-- | mysql-test/r/mix_innodb_myisam_binlog.result | 8 |
1 files changed, 5 insertions, 3 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; |