Merge next-mr -> next-4284.

1 files changed, 210 insertions, 0 deletions

diff --git a/mysql-test/suite/rpl/r/rpl_sp.result b/mysql-test/suite/rpl/r/rpl_sp.result
index ba748049ac1..7f810c5c128 100644
--- a/mysql-test/suite/rpl/r/rpl_sp.result
+++ b/mysql-test/suite/rpl/r/rpl_sp.result
@@ -118,6 +118,7 @@ ERROR 23000: Duplicate entry '20' for key 'a'
 show warnings;
 Level	Code	Message
 Error	1062	Duplicate entry '20' for key 'a'
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
 select * from t2;
 a
 20
@@ -265,6 +266,7 @@ end|
 do fn1(100);
 Warnings:
 Error	1062	Duplicate entry '100' for key 'a'
+Warning	1196	Some non-transactional changed tables couldn't be rolled back
 select fn1(20);
 ERROR 23000: Duplicate entry '20' for key 'a'
 select * from t2;
@@ -416,9 +418,15 @@ set b = 8;
 insert into t1 values (b);
 insert into t1 values (unix_timestamp());
 end
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values ( NAME_CONST('b',8))
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (unix_timestamp())
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t1
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `foo2`()
 select * from mysqltest1.t1
 master-bin.000001	#	Query	#	#	use `mysqltest1`; alter procedure foo2 contains sql
@@ -437,13 +445,25 @@ begin
 insert into t2 values(3);
 insert into t1 values (5);
 end
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(3)
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (15)
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(3)
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest1`; alter procedure foo4 sql security invoker
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(3)
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (5)
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t2
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest1`; alter table t2 add unique (a)
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo4
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `foo4`()
@@ -451,7 +471,9 @@ master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost
 begin
 insert into t2 values(20),(20);
 end
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(20),(20)
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo4
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop procedure foo2
@@ -462,17 +484,27 @@ begin
 insert into t1 values (x);
 return x+2;
 end
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete t1,t2 from t1,t2
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; SELECT `mysqltest1`.`fn1`(20)
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t2 values(fn1(21))
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop function fn1
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`() RETURNS int(11)
     NO SQL
 begin
 return unix_timestamp();
 end
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t1
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values(fn1())
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` FUNCTION `fn2`() RETURNS int(11)
     NO SQL
 begin
@@ -483,7 +515,9 @@ master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost
 begin
 return 0;
 end
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t2
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest1`; alter table t2 add unique (a)
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop function fn1
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` FUNCTION `fn1`(x int) RETURNS int(11)
@@ -491,14 +525,26 @@ begin
 insert into t2 values(x),(x);
 return 10;
 end
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; SELECT `mysqltest1`.`fn1`(100)
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; SELECT `mysqltest1`.`fn1`(20)
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t1
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` trigger trg before insert on t1 for each row set new.a= 10
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (1)
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; delete from t1
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest1`; drop trigger trg
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest1`; insert into t1 values (1)
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest1`; CREATE DEFINER=`root`@`localhost` PROCEDURE `foo`()
     READS SQL DATA
 select * from t1
@@ -519,7 +565,9 @@ return var;
 end
 master-bin.000001	#	Query	#	#	use `test`; CREATE ALGORITHM=UNDEFINED DEFINER=`root`@`localhost` SQL SECURITY DEFINER VIEW `v1` AS select 1 as a
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 (a) values (f1())
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; drop view v1
 master-bin.000001	#	Query	#	#	use `test`; drop function f1
 master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE IF EXISTS p1
@@ -527,7 +575,9 @@ master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS t1
 master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1(col VARCHAR(10))
 master-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(arg VARCHAR(10))
 INSERT INTO t1 VALUES(arg)
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES( NAME_CONST('arg',_latin1'test' COLLATE 'latin1_swedish_ci'))
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE p1
 master-bin.000001	#	Query	#	#	use `test`; DROP PROCEDURE IF EXISTS p1
 master-bin.000001	#	Query	#	#	use `test`; DROP FUNCTION IF EXISTS f1
@@ -545,13 +595,17 @@ master-bin.000001	#	Query	#	#	create database mysqltest2
 master-bin.000001	#	Query	#	#	use `mysqltest2`; create table t ( t integer )
 master-bin.000001	#	Query	#	#	use `mysqltest2`; CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqltest`.`test`()
 begin end
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest2`; insert into t values ( 1 )
+master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	use `mysqltest2`; CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
 begin
 insert into t values (1);
 return 0;
 end
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysqltest`; SELECT `mysqltest2`.`f1`()
+master-bin.000001	#	Query	#	#	COMMIT
 set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;
 set @@global.log_bin_trust_function_creators= @old_log_bin_trust_function_creators;
 drop database mysqltest;
@@ -634,15 +688,33 @@ insert into t1 values (unix_timestamp());
 end
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t1 values ( NAME_CONST('b',8))
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t1 values (unix_timestamp())
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 delete from t1
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `foo2`()
 select * from mysqltest1.t1
 /*!*/;
@@ -681,27 +753,63 @@ insert into t1 values (5);
 end
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t2 values(3)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t1 values (15)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t2 values(3)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 alter procedure foo4 sql security invoker
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t2 values(3)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t1 values (5)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 delete from t2
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 alter table t2 add unique (a)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
@@ -715,9 +823,15 @@ insert into t2 values(20),(20);
 end
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t2 values(20),(20)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 drop procedure foo4
 /*!*/;
 SET TIMESTAMP=t/*!*/;
@@ -738,15 +852,33 @@ return x+2;
 end
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 delete t1,t2 from t1,t2
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 SELECT `mysqltest1`.`fn1`(20)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t2 values(fn1(21))
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 drop function fn1
 /*!*/;
 SET TIMESTAMP=t/*!*/;
@@ -757,12 +889,24 @@ return unix_timestamp();
 end
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 delete from t1
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t1 values(fn1())
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 CREATE DEFINER=`zedjzlcsjhd`@`127.0.0.1` FUNCTION `fn2`() RETURNS int(11)
     NO SQL
 begin
@@ -777,9 +921,15 @@ return 0;
 end
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 delete from t2
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 alter table t2 add unique (a)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
@@ -793,30 +943,66 @@ return 10;
 end
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 SELECT `mysqltest1`.`fn1`(100)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 SELECT `mysqltest1`.`fn1`(20)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 delete from t1
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 CREATE DEFINER=`root`@`localhost` trigger trg before insert on t1 for each row set new.a= 10
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t1 values (1)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 delete from t1
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 drop trigger trg
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t1 values (1)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 CREATE DEFINER=`root`@`localhost` PROCEDURE `foo`()
     READS SQL DATA
 select * from t1
@@ -856,9 +1042,15 @@ SET TIMESTAMP=t/*!*/;
 create table t1 (a int)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t1 (a) values (f1())
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 drop view v1
 /*!*/;
 SET TIMESTAMP=t/*!*/;
@@ -878,9 +1070,15 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `p1`(arg VARCHAR(10))
 INSERT INTO t1 VALUES(arg)
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 INSERT INTO t1 VALUES( NAME_CONST('arg',_latin1'test' COLLATE 'latin1_swedish_ci'))
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 DROP PROCEDURE p1
 /*!*/;
 SET TIMESTAMP=t/*!*/;
@@ -927,20 +1125,32 @@ CREATE DEFINER=`root`@`localhost` PROCEDURE `mysqltest`.`test`()
 begin end
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 insert into t values ( 1 )
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 CREATE DEFINER=`root`@`localhost` FUNCTION `f1`() RETURNS int(11)
 begin
 insert into t values (1);
 return 0;
 end
 /*!*/;
+SET TIMESTAMP=t/*!*/;
+BEGIN
+/*!*/;
 use mysqltest/*!*/;
 SET TIMESTAMP=t/*!*/;
 SELECT `mysqltest2`.`f1`()
 /*!*/;
 SET TIMESTAMP=t/*!*/;
+COMMIT
+/*!*/;
+SET TIMESTAMP=t/*!*/;
 drop database mysqltest
 /*!*/;
 SET TIMESTAMP=t/*!*/;