mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
changed select release_lock() to do release_lock() to avoid having to compare the
non-deterministic result in the test case for BUG#7947 the bug fix for BUG#7947 now fixed the result of mix_innodb_myisam_binlog test, which in the past was missing DO RELEASE_LOCK() in the output of SHOW BINLOG EVENTS
This commit is contained in:
@ -93,6 +93,7 @@ master-bin.000001 79 Query 1 79 use `test`; BEGIN
|
|||||||
master-bin.000001 119 Query 1 79 use `test`; insert into t1 values(8)
|
master-bin.000001 119 Query 1 79 use `test`; insert into t1 values(8)
|
||||||
master-bin.000001 178 Query 1 79 use `test`; insert into t2 select * from t1
|
master-bin.000001 178 Query 1 79 use `test`; insert into t2 select * from t1
|
||||||
master-bin.000001 244 Query 1 244 use `test`; ROLLBACK
|
master-bin.000001 244 Query 1 244 use `test`; ROLLBACK
|
||||||
|
master-bin.000001 287 Query 1 287 use `test`; DO RELEASE_LOCK("a")
|
||||||
delete from t1;
|
delete from t1;
|
||||||
delete from t2;
|
delete from t2;
|
||||||
reset master;
|
reset master;
|
||||||
|
@ -42,7 +42,5 @@ master-bin.000001 583 Query 1 583 use `test`; insert into t0 select GET_LOCK("lo
|
|||||||
master-bin.000001 662 Query 1 662 use `test`; create table t2 (n int) engine=innodb
|
master-bin.000001 662 Query 1 662 use `test`; create table t2 (n int) engine=innodb
|
||||||
master-bin.000001 734 Query 1 734 use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`
|
master-bin.000001 734 Query 1 734 use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `test`.`t1`,`test`.`ti`
|
||||||
master-bin.000001 835 Query 1 835 use `test`; DO RELEASE_LOCK("lock1")
|
master-bin.000001 835 Query 1 835 use `test`; DO RELEASE_LOCK("lock1")
|
||||||
select release_lock("lock1");
|
do release_lock("lock1");
|
||||||
release_lock("lock1")
|
|
||||||
1
|
|
||||||
drop table t0,t2;
|
drop table t0,t2;
|
||||||
|
@ -18,5 +18,5 @@ disconnect master;
|
|||||||
connect (master,localhost,root,,test,$MASTER_MYPORT,master.sock);
|
connect (master,localhost,root,,test,$MASTER_MYPORT,master.sock);
|
||||||
select get_lock("lock1",null);
|
select get_lock("lock1",null);
|
||||||
show binlog events from 79;
|
show binlog events from 79;
|
||||||
select release_lock("lock1");
|
do release_lock("lock1");
|
||||||
drop table t0,t2;
|
drop table t0,t2;
|
||||||
|
Reference in New Issue
Block a user