Manual merge of patch for Bug#46364 from mysql-next-mr-bugfixing.

Conflicts:
  - mysql-test/r/mysqld--help-win.result
  - sql/sys_vars.cc

Original revsion (in next-mr-bugfixing):
------------------------------------------------------------
revno: 2971 [merge]
revision-id: alfranio.correia@sun.com-20100121210527-rbuheu5rnsmcakh1
committer: Alfranio Correia <alfranio.correia@sun.com>
branch nick: mysql-next-mr-bugfixing
timestamp: Thu 2010-01-21 21:05:27 +0000
message:
  BUG#46364 MyISAM transbuffer problems (NTM problem)
        
  It is well-known that due to concurrency issues, a slave can become
  inconsistent when a transaction contains updates to both transaction and
  non-transactional tables.
                      
  In a nutshell, the current code-base tries to preserve causality among the
  statements by writing non-transactional statements to the txn-cache which
  is flushed upon commit. However, modifications done to non-transactional
  tables on behalf of a transaction become immediately visible to other
  connections but may not immediately get into the binary log and therefore
  consistency may be broken.
              
  In general, it is impossible to automatically detect causality/dependency
  among statements by just analyzing the statements sent to the server. This
  happen because dependency may be hidden in the application code and it is
  necessary to know a priori all the statements processed in the context of
  a transaction such as in a procedure. Moreover, even for the few cases that
  we could automatically address in the server, the computation effort
  required could make the approach infeasible.
              
  So, in this patch we introduce the option
        - "--binlog-direct-non-transactional-updates" that can be used to bypass
        the current behavior in order to write directly to binary log statements
        that change non-transactional tables.
  
  Besides, it is used to enable the WL#2687 which is disabled by default.
    ------------------------------------------------------------
    revno: 2970.1.1
    revision-id: alfranio.correia@sun.com-20100121131034-183r4qdyld7an5a0
    parent: alik@sun.com-20100121083914-r9rz2myto3tkdya0
    committer: Alfranio Correia <alfranio.correia@sun.com>
    branch nick: mysql-next-mr-bugfixing
    timestamp: Thu 2010-01-21 13:10:34 +0000
    message:
      BUG#46364 MyISAM transbuffer problems (NTM problem)
            
      It is well-known that due to concurrency issues, a slave can become
      inconsistent when a transaction contains updates to both transaction and
      non-transactional tables.
                          
      In a nutshell, the current code-base tries to preserve causality among the
      statements by writing non-transactional statements to the txn-cache which
      is flushed upon commit. However, modifications done to non-transactional
      tables on behalf of a transaction become immediately visible to other
      connections but may not immediately get into the binary log and therefore
      consistency may be broken.
                  
      In general, it is impossible to automatically detect causality/dependency
      among statements by just analyzing the statements sent to the server. This
      happen because dependency may be hidden in the application code and it is
      necessary to know a priori all the statements processed in the context of
      a transaction such as in a procedure. Moreover, even for the few cases that
      we could automatically address in the server, the computation effort
      required could make the approach infeasible.
                  
      So, in this patch we introduce the option
            - "--binlog-direct-non-transactional-updates" that can be used to bypass
            the current behavior in order to write directly to binary log statements
            that change non-transactional tables.
      
      Besides, it is used to enable the WL#2687 which is disabled by default.

mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test

@@ -344,30 +344,14 @@ BEGIN;
 --eval INSERT INTO t1 (a, data) VALUES (1, $data);
 --eval INSERT INTO t1 (a, data) VALUES (2, $data);
 --eval INSERT INTO t2 (a, data) VALUES (3, $data);
-if (`SELECT @@binlog_format = 'STATEMENT'`)
-{
-  --error ER_TRANS_CACHE_FULL, ER_ERROR_ON_WRITE
-  --eval INSERT INTO t1 (a, data) VALUES (4, $data);
-}
-if (`SELECT @@binlog_format = 'ROW' || @@binlog_format = 'MIXED'`)
-{
-  --eval INSERT INTO t1 (a, data) VALUES (4, $data);
-}
+--eval INSERT INTO t1 (a, data) VALUES (4, $data);
 --error ER_TRANS_CACHE_FULL, ER_ERROR_ON_WRITE
 --eval INSERT INTO t1 (a, data) VALUES (5, $data);
 --error ER_TRANS_CACHE_FULL, ER_ERROR_ON_WRITE
 --eval INSERT INTO t1 (a, data) VALUES (6, $data);
 --error ER_TRANS_CACHE_FULL, ER_ERROR_ON_WRITE
 --eval INSERT INTO t1 (a, data) VALUES (7, $data);
-if (`SELECT @@binlog_format = 'STATEMENT'`)
-{
-  --error ER_TRANS_CACHE_FULL, ER_ERROR_ON_WRITE
-  --eval UPDATE t2 SET data= CONCAT($data, $data);
-}
-if (`SELECT @@binlog_format = 'ROW' || @@binlog_format = 'MIXED'`)
-{
-  --eval UPDATE t2 SET data= CONCAT($data, $data);
-}
+--eval UPDATE t2 SET data= CONCAT($data, $data);
 --eval INSERT INTO t1 (a, data) VALUES (8, 's');
 --eval INSERT INTO t1 (a, data) VALUES (9, 's');
 --eval INSERT INTO t2 (a, data) VALUES (10, 's');
@@ -380,31 +364,12 @@ BEGIN;
 --eval INSERT INTO t1 (a, data) VALUES (15, $data);
 --eval INSERT INTO t1 (a, data) VALUES (16, $data);
 --eval INSERT INTO t2 (a, data) VALUES (17, $data);
-if (`SELECT @@binlog_format = 'STATEMENT'`)
-{
-  --error ER_TRANS_CACHE_FULL, ER_ERROR_ON_WRITE
-  --eval INSERT INTO t1 (a, data) VALUES (18, $data);
-}
-if (`SELECT @@binlog_format = 'ROW' || @@binlog_format = 'MIXED'`)
-{
-  --eval INSERT INTO t1 (a, data) VALUES (18, $data);
-}
+--eval INSERT INTO t1 (a, data) VALUES (18, $data);
 --error ER_TRANS_CACHE_FULL, ER_ERROR_ON_WRITE
 --eval INSERT INTO t1 (a, data) VALUES (19, $data);
 --enable_query_log
 COMMIT;
 
-if (`SELECT @@binlog_format = 'STATEMENT'`)
-{
-  connection slave;
-  --source include/wait_for_slave_sql_to_stop.inc
-  
-  SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1;
-  START SLAVE SQL_THREAD;
-  --source include/wait_for_slave_sql_to_start.inc
-  connection master;
-}
-
 let $diff_statement= SELECT * FROM t1;
 --source include/diff_master_slave.inc
 

mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test

@@ -219,13 +219,12 @@ while (`SELECT $ddl_cases >= 1`)
     # in the binary log:
     #
     # 1: DDL EVENT which triggered the previous commmit.
-    # 2: COMMIT
-    # 3: BEGIN
-    # 4: TABLE MAP EVENT
-    # 5: TABLE MAP EVENT (ndb_apply_status)
+    # 2: BEGIN
+    # 3: TABLE MAP EVENT
+    # 4: TABLE MAP EVENT (ndb_apply_status)
+    # 5: ROW EVENT
     # 6: ROW EVENT
-    # 7: ROW EVENT
-    # 8: COMMIT
+    # 7: COMMIT
     #
     if (`SELECT '$engine' = 'NDB' && @@binlog_format != 'ROW'`)
     {
@@ -362,8 +361,11 @@ while (`SELECT $ddl_cases >= 1`)
     # does not commit the current transaction.
     #
     # 1: BEGIN
-    # 2: INSERT
-    # 3: CREATE TEMPORARY
+    # 2: CREATE TEMPORARY
+    # 3: COMMIT
+    # 4: BEGIN
+    # 5: INSERT
+    # 6: COMMIT
     #
     # In RBR the transaction is not committed either and the statement is not
     # written to the binary log:
@@ -371,10 +373,11 @@ while (`SELECT $ddl_cases >= 1`)
     # 1: BEGIN
     # 2: TABLE MAP EVENT
     # 3: ROW EVENT
+    # 4: COMMIT
     #
-    if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`)
+    if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'` )
     {
-      let $commit_event_row_number= 4;
+      let $commit_event_row_number= 6;
     }
     #
     # In NDB (RBR mode), the commit event is the sixth event
@@ -482,9 +485,14 @@ while (`SELECT $ddl_cases >= 1`)
     # In SBR and MIXED modes, the DDL statement is written to the binary log
     # but does not commit the current transaction:
     #
+    # In SBR, we have what follows:
+    #
     # 1: BEGIN
-    # 2: INSERT
-    # 3: DROP TEMPORARY
+    # 2: DROP TEMPORARY
+    # 3: COMMIT
+    # 4: BEGIN
+    # 5: INSERT
+    # 6: COMMIT
     #
     # In RBR the transaction is not committed either and the statement is not
     # written to the binary log:
@@ -492,8 +500,13 @@ while (`SELECT $ddl_cases >= 1`)
     # 1: BEGIN
     # 2: TABLE MAP EVENT
     # 3: ROW EVENT
+    # 4: COMMIT
     #
     if (`select @@binlog_format = 'STATEMENT'`)
+    {
+      let $commit_event_row_number= 6;
+    }
+    if (`select @@binlog_format = 'ROW'`)
     {
       let $commit_event_row_number= 4;
     }
@@ -503,6 +516,7 @@ while (`SELECT $ddl_cases >= 1`)
     # 2: TABLE MAP EVENT
     # 3: ROW EVENT
     # 4: DROP TEMPORARY table IF EXISTS
+    # 5: COMMIT
     #
     if (`select @@binlog_format = 'MIXED'`)
     {

mysql-test/extra/rpl_tests/rpl_mixing_engines.test

@@ -1767,7 +1767,10 @@ sync_slave_with_master;
   
 --exec $MYSQL_DUMP --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/test-nmt-master.sql
 --exec $MYSQL_DUMP_SLAVE --compact --order-by-primary --skip-extended-insert --no-create-info test > $MYSQLTEST_VARDIR/tmp/test-nmt-slave.sql
---diff_files $MYSQLTEST_VARDIR/tmp/test-nmt-master.sql $MYSQLTEST_VARDIR/tmp/test-nmt-slave.sql
+if (`select @@session.binlog_format != 'STATEMENT'`)
+{
+  --diff_files $MYSQLTEST_VARDIR/tmp/test-nmt-master.sql $MYSQLTEST_VARDIR/tmp/test-nmt-slave.sql
+}
   
 --echo ###################################################################################
 --echo #                                        CLEAN

mysql-test/include/default_mysqld.cnf

@@ -44,3 +44,4 @@ log-bin=mysqld-bin
 # Run tests with the performance schema instrumentation
 loose-enable-performance-schema
 
+binlog-direct-non-transactional-updates

mysql-test/suite/binlog/r/binlog_multi_engine.result

@@ -33,9 +33,11 @@ mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c
 mysqld-bin.000001	#	Query	#	#	COMMIT
 mysqld-bin.000001	#	Query	#	#	BEGIN
+mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c
+mysqld-bin.000001	#	Query	#	#	COMMIT
+mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1n VALUES (1,1), (1,2), (2,1), (2,2)
 mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t1m, t1n SET m = 2, e = 3 WHERE n = f
-mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t1n, t1b SET e = 2, b = 3 WHERE f = c
 mysqld-bin.000001	#	Query	#	#	COMMIT
 mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Table_map	#	#	table_id: # (test.t1n)

mysql-test/suite/binlog/r/binlog_format_switch_inside_trans.result → mysql-test/suite/binlog/r/binlog_switch_inside_trans.result

 set @save_binlog_format= @@global.binlog_format;
+set @save_binlog_dirct= @@global.binlog_direct_non_transactional_updates;
 create table t1 (a int) engine= myisam;
 create table t2 (a int) engine= innodb;
 SELECT @@session.binlog_format;
@@ -8,19 +9,27 @@ SET AUTOCOMMIT=1;
 # Test that the session variable 'binlog_format' 
 # is writable outside a transaction.
 set @@session.binlog_format= statement;
+set @@session.binlog_direct_non_transactional_updates= TRUE;
 SELECT @@session.binlog_format;
 @@session.binlog_format
 STATEMENT
+SELECT @@session.binlog_direct_non_transactional_updates;
+@@session.binlog_direct_non_transactional_updates
+1
 begin;
 # Test that the session variable 'binlog_format' is read-only
 # inside a transaction with no preceding updates.
 set @@session.binlog_format= mixed;
 ERROR HY000: Cannot modify @@session.binlog_format inside a transaction
+set @@session.binlog_direct_non_transactional_updates= FALSE;
+ERROR HY000: Cannot modify @@session.binlog_direct_non_transactional_updates inside a transaction
 insert into t2 values (1);
 # Test that the session variable 'binlog_format' is read-only
 # inside a transaction with preceding transactional updates.
 set @@session.binlog_format= row;
 ERROR HY000: Cannot modify @@session.binlog_format inside a transaction
+set @@session.binlog_direct_non_transactional_updates= FALSE;
+ERROR HY000: Cannot modify @@session.binlog_direct_non_transactional_updates inside a transaction
 commit;
 begin;
 insert into t1 values (2);
@@ -28,31 +37,47 @@ insert into t1 values (2);
 # inside a transaction with preceding non-transactional updates.
 set @@session.binlog_format= statement;
 ERROR HY000: Cannot modify @@session.binlog_format inside a transaction
+set @@session.binlog_direct_non_transactional_updates= FALSE;
+ERROR HY000: Cannot modify @@session.binlog_direct_non_transactional_updates inside a transaction
 commit;
 # Test that the session variable 'binlog_format' is writable 
 # when AUTOCOMMIT=0, before a transaction has started.
 set AUTOCOMMIT=0;
 set @@session.binlog_format= row;
+set @@session.binlog_direct_non_transactional_updates= FALSE;
 SELECT @@session.binlog_format;
 @@session.binlog_format
 ROW
+SELECT @@session.binlog_direct_non_transactional_updates;
+@@session.binlog_direct_non_transactional_updates
+0
 insert into t1 values (4);
 # Test that the session variable 'binlog_format' is read-only inside an
 # AUTOCOMMIT=0 transaction with preceding non-transactional updates.
 set @@session.binlog_format= statement;
 ERROR HY000: Cannot modify @@session.binlog_format inside a transaction
+set @@session.binlog_direct_non_transactional_updates= TRUE;
+ERROR HY000: Cannot modify @@session.binlog_direct_non_transactional_updates inside a transaction
 SELECT @@session.binlog_format;
 @@session.binlog_format
 ROW
+SELECT @@session.binlog_direct_non_transactional_updates;
+@@session.binlog_direct_non_transactional_updates
+0
 commit;
 insert into t2 values (5);
 # Test that the session variable 'binlog_format' is read-only inside an
 # AUTOCOMMIT=0 transaction with preceding transactional updates.
 set @@session.binlog_format= row;
 ERROR HY000: Cannot modify @@session.binlog_format inside a transaction
+set @@session.binlog_direct_non_transactional_updates= TRUE;
+ERROR HY000: Cannot modify @@session.binlog_direct_non_transactional_updates inside a transaction
 SELECT @@session.binlog_format;
 @@session.binlog_format
 ROW
+SELECT @@session.binlog_direct_non_transactional_updates;
+@@session.binlog_direct_non_transactional_updates
+0
 commit;
 begin;
 insert into t2 values (6);
@@ -62,15 +87,20 @@ SELECT @@global.binlog_format;
 @@global.binlog_format
 ROW
 set @@global.binlog_format= statement;
+set @@global.binlog_direct_non_transactional_updates= TRUE;
 SELECT @@global.binlog_format;
 @@global.binlog_format
 STATEMENT
+SELECT @@global.binlog_direct_non_transactional_updates;
+@@global.binlog_direct_non_transactional_updates
+1
 commit;
 set @@global.binlog_format= @save_binlog_format;
+set  @@global.binlog_direct_non_transactional_updates= @save_binlog_dirct;
 create table t3(a int, b int) engine= innodb;
 create table t4(a int) engine= innodb;
 create table t5(a int) engine= innodb;
-create trigger tr2 after insert on t3 for each row begin
+create trigger tr1 after insert on t3 for each row begin
 insert into t4(a) values(1);
 set @@session.binlog_format= statement; 
 insert into t4(a) values(2);
@@ -83,8 +113,27 @@ ERROR HY000: Cannot change the binary logging format inside a stored function or
 SELECT @@session.binlog_format;
 @@session.binlog_format
 ROW
+create table t6(a int, b int) engine= innodb;
+create table t7(a int) engine= innodb;
+create table t8(a int) engine= innodb;
+create trigger tr2 after insert on t6 for each row begin
+insert into t7(a) values(1);
+set @@global.binlog_direct_non_transactional_updates= FALSE;
+insert into t7(a) values(2);
+insert into t8(a) values(3);
+end |
+# Test that the session variable 'binlog_format' is read-only
+# in sub-statements.
+insert into t6(a,b) values(1,1);
+ERROR HY000: Cannot change the binlog direct flag inside a stored function or trigger
+SELECT @@session.binlog_direct_non_transactional_updates;
+@@session.binlog_direct_non_transactional_updates
+0
 drop table t1;
 drop table t2;
 drop table t3;
 drop table t4;
 drop table t5;
+drop table t6;
+drop table t7;
+drop table t8;

mysql-test/suite/binlog/t/binlog_stm_mix_innodb_myisam-master.opt

---innodb_lock_wait_timeout=2
+--innodb_lock_wait_timeout=2 --binlog-direct-non-transactional-updates=FALSE

mysql-test/suite/binlog/t/binlog_format_switch_inside_trans.test → mysql-test/suite/binlog/t/binlog_switch_inside_trans.test

@@ -8,6 +8,7 @@ source include/have_innodb.inc;
 source include/have_binlog_format_row.inc;
 
 set @save_binlog_format= @@global.binlog_format;
+set @save_binlog_dirct= @@global.binlog_direct_non_transactional_updates;
 create table t1 (a int) engine= myisam;
 create table t2 (a int) engine= innodb;
 
@@ -16,19 +17,25 @@ SET AUTOCOMMIT=1;
 --echo # Test that the session variable 'binlog_format' 
 --echo # is writable outside a transaction.
 set @@session.binlog_format= statement;
+set @@session.binlog_direct_non_transactional_updates= TRUE;
 SELECT @@session.binlog_format;
+SELECT @@session.binlog_direct_non_transactional_updates;
 
 begin;
 --echo # Test that the session variable 'binlog_format' is read-only
 --echo # inside a transaction with no preceding updates.
 --error ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_FORMAT
   set @@session.binlog_format= mixed;
+--error ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_DIRECT
+  set @@session.binlog_direct_non_transactional_updates= FALSE;
 
   insert into t2 values (1);
 --echo # Test that the session variable 'binlog_format' is read-only
 --echo # inside a transaction with preceding transactional updates.
 --error ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_FORMAT
   set @@session.binlog_format= row;
+--error ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_DIRECT
+  set @@session.binlog_direct_non_transactional_updates= FALSE;
 commit;
 
 begin;
@@ -37,20 +44,27 @@ begin;
 --echo # inside a transaction with preceding non-transactional updates.
 --error ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_FORMAT
   set @@session.binlog_format= statement;
+--error ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_DIRECT
+  set @@session.binlog_direct_non_transactional_updates= FALSE;
 commit;
 
 --echo # Test that the session variable 'binlog_format' is writable 
 --echo # when AUTOCOMMIT=0, before a transaction has started.
 set AUTOCOMMIT=0;
 set @@session.binlog_format= row;
+set @@session.binlog_direct_non_transactional_updates= FALSE;
 SELECT @@session.binlog_format;
+SELECT @@session.binlog_direct_non_transactional_updates;
 
 insert into t1 values (4);
 --echo # Test that the session variable 'binlog_format' is read-only inside an
 --echo # AUTOCOMMIT=0 transaction with preceding non-transactional updates.
 --error ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_FORMAT
 set @@session.binlog_format= statement;
+--error ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_DIRECT
+set @@session.binlog_direct_non_transactional_updates= TRUE;
 SELECT @@session.binlog_format;
+SELECT @@session.binlog_direct_non_transactional_updates;
 commit;
 
 insert into t2 values (5);
@@ -58,7 +72,10 @@ insert into t2 values (5);
 --echo # AUTOCOMMIT=0 transaction with preceding transactional updates.
 --error ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_FORMAT
 set @@session.binlog_format= row;
+--error ER_INSIDE_TRANSACTION_PREVENTS_SWITCH_BINLOG_DIRECT
+set @@session.binlog_direct_non_transactional_updates= TRUE;
 SELECT @@session.binlog_format;
+SELECT @@session.binlog_direct_non_transactional_updates;
 commit;
 
 begin;
@@ -67,16 +84,19 @@ begin;
 --echo # inside a transaction.
   SELECT @@global.binlog_format;
   set @@global.binlog_format= statement;
+  set @@global.binlog_direct_non_transactional_updates= TRUE;
   SELECT @@global.binlog_format;
+  SELECT @@global.binlog_direct_non_transactional_updates;
 commit;
 
 set @@global.binlog_format= @save_binlog_format;
+set  @@global.binlog_direct_non_transactional_updates= @save_binlog_dirct;
 
 create table t3(a int, b int) engine= innodb;
 create table t4(a int) engine= innodb;
 create table t5(a int) engine= innodb;
 delimiter |;
-eval create trigger tr2 after insert on t3 for each row begin
+eval create trigger tr1 after insert on t3 for each row begin
     insert into t4(a) values(1);
     set @@session.binlog_format= statement; 
     insert into t4(a) values(2);
@@ -90,9 +110,29 @@ delimiter ;|
 insert into t3(a,b) values(1,1);
 SELECT @@session.binlog_format;
 
+create table t6(a int, b int) engine= innodb;
+create table t7(a int) engine= innodb;
+create table t8(a int) engine= innodb;
+delimiter |;
+eval create trigger tr2 after insert on t6 for each row begin
+    insert into t7(a) values(1);
+    set @@global.binlog_direct_non_transactional_updates= FALSE;
+    insert into t7(a) values(2);
+    insert into t8(a) values(3);
+end |
+delimiter ;|
+
+--echo # Test that the session variable 'binlog_format' is read-only
+--echo # in sub-statements.
+--error ER_STORED_FUNCTION_PREVENTS_SWITCH_BINLOG_DIRECT
+insert into t6(a,b) values(1,1);
+SELECT @@session.binlog_direct_non_transactional_updates;
+
 drop table t1;
 drop table t2;
 drop table t3;
 drop table t4;
 drop table t5;
-
+drop table t6;
+drop table t7;
+drop table t8;

mysql-test/suite/ndb/r/ndb_binlog_format.result

@@ -29,9 +29,11 @@ mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t1, t2 SET m = 2, b = 3 WHERE n = c
 mysqld-bin.000001	#	Query	#	#	COMMIT
 mysqld-bin.000001	#	Query	#	#	BEGIN
+mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c
+mysqld-bin.000001	#	Query	#	#	COMMIT
+mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Query	#	#	use `test`; INSERT INTO t3 VALUES (1,1), (1,2), (2,1), (2,2)
 mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t1, t3 SET m = 2, e = 3 WHERE n = f
-mysqld-bin.000001	#	Query	#	#	use `test`; UPDATE t3, t2 SET e = 2, b = 3 WHERE f = c
 mysqld-bin.000001	#	Query	#	#	COMMIT
 mysqld-bin.000001	#	Query	#	#	BEGIN
 mysqld-bin.000001	#	Table_map	#	#	table_id: # (test.t3)

mysql-test/suite/rpl/r/rpl_begin_commit_rollback.result

@@ -6,6 +6,7 @@ drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
 call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
+SET @@session.binlog_direct_non_transactional_updates= FALSE;
 DROP DATABASE IF EXISTS db1;
 CREATE DATABASE db1;
 use db1;

mysql-test/suite/rpl/r/rpl_concurrency_error.result

@@ -38,12 +38,14 @@ Warning	1196	Some non-transactional changed tables couldn't be rolled back
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO n VALUES (now(),"brown")
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t SET f = 'yellow 2' WHERE i = 3
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t SET f = 'magenta 2' WHERE f = 'red'
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t VALUES (5 + (2 * 10),"brown")
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO n VALUES (now(),"brown")
 master-bin.000001	#	Query	#	#	ROLLBACK
 SET AUTOCOMMIT = 1;
 BEGIN;
@@ -63,12 +65,14 @@ COMMIT;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO n VALUES (now(),"brown")
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t SET f = 'gray 2' WHERE i = 3
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t SET f = 'dark blue 2' WHERE f = 'red'
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t VALUES (6 + (2 * 10),"brown")
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO n VALUES (now(),"brown")
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 SET AUTOCOMMIT = 0;
 UPDATE t SET f = 'yellow 1' WHERE i = 3;
@@ -88,12 +92,14 @@ Warning	1196	Some non-transactional changed tables couldn't be rolled back
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO n VALUES (now(),"brown")
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t SET f = 'yellow 1' WHERE i = 3
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t SET f = 'magenta 1' WHERE f = 'red'
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t VALUES (5 + (1 * 10),"brown")
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO n VALUES (now(),"brown")
 master-bin.000001	#	Query	#	#	ROLLBACK
 SET AUTOCOMMIT = 0;
 UPDATE t SET f = 'gray 1' WHERE i = 3;
@@ -111,12 +117,14 @@ COMMIT;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO n VALUES (now(),"brown")
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t SET f = 'gray 1' WHERE i = 3
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; UPDATE t SET f = 'dark blue 1' WHERE f = 'red'
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t VALUES (6 + (1 * 10),"brown")
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO n VALUES (now(),"brown")
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 source include/diff_master_slave.inc;
 source include/diff_master_slave.inc;

mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result

@@ -393,8 +393,10 @@ CREATE TEMPORARY TABLE tt_xx (a int);
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(ddl_case) VALUES (11)
 master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx (a int)
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(ddl_case) VALUES (11)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 

mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result

@@ -11868,6 +11868,9 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 -b-b-b-b-b-b-b-b-b-b-b- >> CT << -b-b-b-b-b-b-b-b-b-b-b-
 CREATE TEMPORARY TABLE tt_xx_11 (a int) engine=Innodb;;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_11 (a int) engine=Innodb
+master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> CT << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> R << -b-b-b-b-b-b-b-b-b-b-b-
 ROLLBACK;
@@ -11875,6 +11878,9 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> B T CT R << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_11 (a int) engine=Innodb
+master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> B T CT R << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> drop-CT << -b-b-b-b-b-b-b-b-b-b-b-
@@ -11906,6 +11912,9 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 -b-b-b-b-b-b-b-b-b-b-b- >> CT << -b-b-b-b-b-b-b-b-b-b-b-
 CREATE TEMPORARY TABLE tt_xx_12 (a int) engine=Innodb;;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_12 (a int) engine=Innodb
+master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> CT << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> R1 << -b-b-b-b-b-b-b-b-b-b-b-
 ROLLBACK TO s1;
@@ -11919,6 +11928,9 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> B T S1 T CT R1 R << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_12 (a int) engine=Innodb
+master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> B T S1 T CT R1 R << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> drop-CT << -b-b-b-b-b-b-b-b-b-b-b-
@@ -11942,6 +11954,9 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 -b-b-b-b-b-b-b-b-b-b-b- >> CT << -b-b-b-b-b-b-b-b-b-b-b-
 CREATE TEMPORARY TABLE tt_xx_13 (a int) engine=Innodb;;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_13 (a int) engine=Innodb
+master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> CT << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> T << -b-b-b-b-b-b-b-b-b-b-b-
 INSERT INTO tt_1(trans_id, stmt_id) VALUES (355, 5);
@@ -11953,6 +11968,9 @@ Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> B T CT T R << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_13 (a int) engine=Innodb
+master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> B T CT T R << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> drop-CT << -b-b-b-b-b-b-b-b-b-b-b-

mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result

@@ -130,8 +130,8 @@ Note	1592	Unsafe statement binlogged in statement format since BINLOG_FORMAT = S
 Got one of the listed errors
 Got one of the listed errors
 Got one of the listed errors
-Got one of the listed errors
-Got one of the listed errors
+Warnings:
+Note	1592	Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: Non-transactional reads or writes are unsafe if they occur after transactional reads or writes inside a transaction.
 Warnings:
 Note	1592	Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: Non-transactional reads or writes are unsafe if they occur after transactional reads or writes inside a transaction.
 COMMIT;
@@ -139,10 +139,7 @@ BEGIN;
 Warnings:
 Note	1592	Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT. Reason for unsafeness: Non-transactional reads or writes are unsafe if they occur after transactional reads or writes inside a transaction.
 Got one of the listed errors
-Got one of the listed errors
 COMMIT;
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1;
-START SLAVE SQL_THREAD;
 source include/diff_master_slave.inc;
 ########################################################################################
 #                                        CLEAN

mysql-test/suite/rpl/r/rpl_stm_implicit_commit_binlog.result

@@ -393,8 +393,10 @@ CREATE TEMPORARY TABLE tt_xx (a int);
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(ddl_case) VALUES (11)
 master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx (a int)
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(ddl_case) VALUES (11)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -429,8 +431,10 @@ DROP TEMPORARY TABLE IF EXISTS new_tt_xx;
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(ddl_case) VALUES (8)
 master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE IF EXISTS new_tt_xx
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(ddl_case) VALUES (8)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 

mysql-test/suite/rpl/r/rpl_stm_start_stop_slave.result

@@ -4,6 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+SET @@session.binlog_direct_non_transactional_updates= FALSE;
 call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
 call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
 create table t1(n int);

mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result

@@ -4,6 +4,7 @@ reset master;
 reset slave;
 drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
 start slave;
+SET @@session.binlog_direct_non_transactional_updates= FALSE;
 call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
 create table tm (a int auto_increment primary key) engine=myisam;
 create table ti (a int auto_increment primary key) engine=innodb;

mysql-test/suite/rpl/t/rpl_begin_commit_rollback.test

@@ -8,6 +8,8 @@ call mtr.add_suppression("Unsafe statement binlogged in statement format since B
 connection master;
 call mtr.add_suppression("Unsafe statement binlogged in statement format since BINLOG_FORMAT = STATEMENT");
 
+SET @@session.binlog_direct_non_transactional_updates= FALSE;
+
 disable_warnings;
 DROP DATABASE IF EXISTS db1;
 enable_warnings;

mysql-test/suite/rpl/t/rpl_stm_start_stop_slave.test

@@ -5,4 +5,5 @@
 --source include/have_binlog_format_statement.inc
 --source include/have_innodb.inc
 
+SET @@session.binlog_direct_non_transactional_updates= FALSE;
 --source ./extra/rpl_tests/rpl_start_stop_slave.test