From 637c800191dc1ccdfcbdedf04575b10beeb85575 Mon Sep 17 00:00:00 2001
From: "sasha@asksasha.com" <>
Date: Mon, 7 Nov 2005 20:51:30 -0700
Subject: [PATCH] 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

---
 mysql-test/r/mix_innodb_myisam_binlog.result | 1 +
 mysql-test/r/rpl_bug7947.result              | 4 +---
 mysql-test/t/rpl_bug7947.test                | 2 +-
 3 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/mysql-test/r/mix_innodb_myisam_binlog.result b/mysql-test/r/mix_innodb_myisam_binlog.result
index 72288d1027b..587209a26ae 100644
--- a/mysql-test/r/mix_innodb_myisam_binlog.result
+++ b/mysql-test/r/mix_innodb_myisam_binlog.result
@@ -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	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	287	Query	1	287	use `test`; DO RELEASE_LOCK("a")
 delete from t1;
 delete from t2;
 reset master;
diff --git a/mysql-test/r/rpl_bug7947.result b/mysql-test/r/rpl_bug7947.result
index 8053f47d7d5..117e71a63d5 100644
--- a/mysql-test/r/rpl_bug7947.result
+++ b/mysql-test/r/rpl_bug7947.result
@@ -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	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")
-select release_lock("lock1");
-release_lock("lock1")
-1
+do release_lock("lock1");
 drop table t0,t2;
diff --git a/mysql-test/t/rpl_bug7947.test b/mysql-test/t/rpl_bug7947.test
index 15630ebea04..e802a311b6c 100644
--- a/mysql-test/t/rpl_bug7947.test
+++ b/mysql-test/t/rpl_bug7947.test
@@ -18,5 +18,5 @@ disconnect master;
 connect (master,localhost,root,,test,$MASTER_MYPORT,master.sock);
 select get_lock("lock1",null);
 show binlog events from 79;
-select release_lock("lock1");
+do release_lock("lock1");
 drop table t0,t2;