merged in the test case for BUG#7947

mysql-test/r/mix_innodb_myisam_binlog.result

@@ -203,3 +203,51 @@ select (@after-@before) >= 2;
 (@after-@before) >= 2
 1
 drop table t1,t2;
+commit;
+begin;
+create temporary table ti (a int) engine=innodb;
+rollback;
+Warnings:
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
+insert into ti values(1);
+set autocommit=0;
+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;
+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
+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
+master-bin.000001	119	Query	1	79	use `test`; insert into t1 values(16)
+master-bin.000001	179	Query	1	79	use `test`; insert into t1 values(18)
+master-bin.000001	239	Query	1	239	use `test`; COMMIT
+master-bin.000001	280	Query	1	280	use `test`; delete from t1
+master-bin.000001	329	Query	1	329	use `test`; delete from t2
+master-bin.000001	378	Query	1	378	use `test`; alter table t2 type=MyISAM
+master-bin.000001	439	Query	1	439	use `test`; insert into t1 values (1)
+master-bin.000001	499	Query	1	499	use `test`; insert into t2 values (20)
+master-bin.000001	560	Query	1	560	use `test`; drop table t1,t2
+master-bin.000001	611	Query	1	611	use `test`; BEGIN
+master-bin.000001	651	Query	1	611	use `test`; create temporary table ti (a int) engine=innodb
+master-bin.000001	733	Query	1	733	use `test`; ROLLBACK
+master-bin.000001	776	Query	1	776	use `test`; insert into ti values(1)
+master-bin.000001	835	Query	1	835	use `test`; BEGIN
+master-bin.000001	875	Query	1	835	use `test`; create temporary table t1 (a int) engine=myisam
+master-bin.000001	957	Query	1	957	use `test`; COMMIT
+master-bin.000001	998	Query	1	998	use `test`; create table t0 (n int)
+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
+do release_lock("lock1");
+drop table t0,t2;

mysql-test/r/rpl_bug7947.result

-stop slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-reset master;
-reset slave;
-drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
-start slave;
-begin;
-create temporary table ti (a int) engine=innodb;
-rollback;
-Warnings:
-Warning	1196	Some non-transactional changed tables couldn't be rolled back
-insert into ti values(1);
-set autocommit=0;
-create temporary table t1 (a int) type=myisam;
-Warnings:
-Warning	1287	'TYPE=storage_engine' is deprecated; use 'ENGINE=storage_engine' instead
-commit;
-insert t1 values (1);
-rollback;
-create table t0 (n int);
-insert t0 select * from t1;
-set autocommit=1;
-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)
-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
-master-bin.000001	119	Query	1	79	use `test`; create temporary table ti (a int) engine=innodb
-master-bin.000001	201	Query	1	201	use `test`; ROLLBACK
-master-bin.000001	244	Query	1	244	use `test`; insert into ti values(1)
-master-bin.000001	303	Query	1	303	use `test`; BEGIN
-master-bin.000001	343	Query	1	303	use `test`; create temporary table t1 (a int) type=myisam
-master-bin.000001	423	Query	1	423	use `test`; COMMIT
-master-bin.000001	464	Query	1	464	use `test`; create table t0 (n int)
-master-bin.000001	522	Query	1	522	use `test`; insert t0 select * from t1
-master-bin.000001	583	Query	1	583	use `test`; insert into t0 select GET_LOCK("lock1",null)
-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")
-do release_lock("lock1");
-drop table t0,t2;

mysql-test/t/mix_innodb_myisam_binlog.test

@@ -206,7 +206,33 @@ select (@after:=unix_timestamp())*0; # always give repeatable output
 # the bug, the reap would return immediately after the insert into t2.
 select (@after-@before) >= 2;
 
-# cleanup
 drop table t1,t2;
+commit;
+
+# test for BUG#7947 - DO RELEASE_LOCK() not written to binlog on rollback in the middle
+# of a transaction
+
+connection con2;
+begin;
+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 table t0 (n int);
+insert t0 select * from t1;
+set autocommit=1;
+insert into t0 select GET_LOCK("lock1",null);
+set autocommit=0;
+create table t2 (n int) engine=innodb;
+insert into t2 values (3); 
+disconnect con2;
+connection con3;
+select get_lock("lock1",null);
+show binlog events from 79;
+do release_lock("lock1");
+drop table t0,t2;
+
 
 # End of 4.1 tests

mysql-test/t/rpl_bug7947.test

---source include/master-slave.inc
-connection master;
-begin;
-create temporary table ti (a int) engine=innodb;
-rollback;
-insert into ti values(1);
-set autocommit=0;
-create temporary table t1 (a int) type=myisam; commit;
-insert t1 values (1); rollback;
-create table t0 (n int);
-insert t0 select * from t1;
-set autocommit=1;
-insert into t0 select GET_LOCK("lock1",null);
-set autocommit=0;
-create table t2 (n int) engine=innodb;
-insert into t2 values (3); 
-disconnect master;
-connect (master,localhost,root,,test,$MASTER_MYPORT,master.sock);
-select get_lock("lock1",null);
-show binlog events from 79;
-do release_lock("lock1");
-drop table t0,t2;