bk commit into 4.1 tree (sasha:1.2467) BUG#7947

[Sasha Pachev]

Below is the list of changes that have just been committed into a local
4.1 repository of sasha. When sasha does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2467 05/11/07 20:51:30 sasha@stripped +3 -0
  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/t/rpl_bug7947.test
    1.2 05/11/07 20:51:23 sasha@stripped +1 -1
    changed select release_lock() to do release_lock() to avoid having to compare the 
    non-deterministic result

  mysql-test/r/rpl_bug7947.result
    1.2 05/11/07 20:51:23 sasha@stripped +1 -3
    changed select release_lock() to do release_lock() to avoid having to compare the 
    non-deterministic result

  mysql-test/r/mix_innodb_myisam_binlog.result
    1.10 05/11/07 20:51:23 sasha@stripped +1 -0
    DO RELEASE_LOCK() was supposed to be there from the very start

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/reiser-data/mysql-dev/mysql-4.1-bug7947

--- 1.9/mysql-test/r/mix_innodb_myisam_binlog.result	2004-11-12 08:44:14 -07:00
+++ 1.10/mysql-test/r/mix_innodb_myisam_binlog.result	2005-11-07 20:51:23 -07:00
@@ -93,6 +93,7 @@
 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;

--- 1.1/mysql-test/r/rpl_bug7947.result	2005-11-07 15:01:29 -07:00
+++ 1.2/mysql-test/r/rpl_bug7947.result	2005-11-07 20:51:23 -07:00
@@ -42,7 +42,5 @@
 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;

--- 1.1/mysql-test/t/rpl_bug7947.test	2005-11-07 15:01:29 -07:00
+++ 1.2/mysql-test/t/rpl_bug7947.test	2005-11-07 20:51:23 -07:00
@@ -18,5 +18,5 @@
 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;