List:Commits« Previous MessageNext Message »
From:Luís Soares Date:June 24 2010 9:11am
Subject:Fwd: Re: bzr commit into mysql-trunk-bugfixing branch
(alfranio.correia:3073) Bug#53259
View as plain text  

-------- Original Message --------
Subject: Re: bzr commit into mysql-trunk-bugfixing branch (alfranio.correia:3073)
Bug#53259
Date: Thu, 24 Jun 2010 10:07:31 +0100
From: Luís Soares <Luis.Soares@stripped>
To: Alfranio Correia <Alfranio.Correia@stripped>

Hi Alfranio,

  Approved.

  I have one suggestion inline about where to put
the comments. You can choose to take it or not, do
as you like.

Regards,
Luís


On 24/06/10 04:56, Alfranio Correia wrote:
> #At
> file:///home/acorreia/workspace.sun/repository.mysql.new/bzrwork/bug-53259/mysql-trunk-bugfixing/
> based on revid:luis.soares@stripped
> 
>  3073 Alfranio Correia	2010-06-24
>       BUG#53259 Unsafe statement binlogged in statement format w/MyIsam temp tables
>       
>       Changed criteria to classify a statement as unsafe in order to reduce the
>       number of spurious warnings. So a statement is classified as unsafe when
>       there is an on-going transaction and:
>         1. It is a mixed statement that updates both types of tables.

OK

>         2. It is a mixed statement that updates a transactional table and reads 
>         from a non-transactional table.

OK

>         3. It is a mixed statement that updates a non-transactional table and
>         reads from a transactional table when the isolation level is lower than
>         serializability.

OK

>       Or when there is an on-going transaction and a transactional table was
>       already updated and:
>       
>         4. It is a mixed statement that updates a non-transactional table and
>         reads from a transactional table.

OK

>         5. It is a statement that updates a non-transactional table and the
>         option variables.binlog_direct_non_trans_update is OFF.

OK

>       Temporary tables are handled as transactional tables in regarding to how
>       they are written to binary log. See details below.
>       
>       In particular, the patch has changed what follows:
>       
>         . It avoids classifying a mixed statement as unsafe where there is
>         no on-going transaction.
>       
>         . When there is an on-going transaction and a mixed statement updated
>         a non-transactional table and read from a transactional table, the
>         statement is classified as unsafe only when the isolation level is not
>         serializable or a transactional table was already updated.

Good.

>         . A a statement that updates only a non-transactional table is classifed

typo: classifed

>         as unsafe if there is an on-going transaction and a transactional table
>         was already updated and the option variables.binlog_direct_non_trans_update
>         is OFF.

OK

>         . Temporary tables are handled as transactional tables in regarding to how
>         they are written to binary log when there is an on-going transaction and a
>         transactional table was already updated.

OK

>     modified:
>       mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test
>       mysql-test/suite/binlog/r/binlog_multi_engine.result
>       mysql-test/suite/binlog/r/binlog_stm_binlog.result
>       mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result
>       mysql-test/suite/ndb/r/ndb_binlog_format.result
>       mysql-test/suite/rpl/r/rpl_concurrency_error.result
>       mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result
>       mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result
>       mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result
>       mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result
>       mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result
>       mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result
>       mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result
>       mysql-test/suite/rpl/r/rpl_temp_temporary.result
>       mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test
>       mysql-test/suite/rpl/t/rpl_temp_temporary.test
>       sql/log.cc
>       sql/log.h
>       sql/sql_class.cc
> === modified file 'mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test'
> --- a/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test	2010-04-28 12:47:49
> +0000
> +++ b/mysql-test/extra/rpl_tests/rpl_binlog_max_cache_size.test	2010-06-24 03:56:09
> +0000
> @@ -77,11 +77,11 @@ eval UPDATE t2, t1 SET t2.data = CONCAT(
>  connection slave;
>  --source include/wait_for_slave_sql_to_stop.inc
>  
> -if (`SELECT @@binlog_format = 'STATEMENT'`)
> +if (`SELECT @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'`)
>  {
>    SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1;
>  }
> -if (`SELECT @@binlog_format = 'ROW' || @@binlog_format = 'MIXED'`)
> +if (`SELECT @@binlog_format = 'ROW'`)
>  {
>    SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 2;
>  }
> 
> === modified file 'mysql-test/suite/binlog/r/binlog_multi_engine.result'
> --- a/mysql-test/suite/binlog/r/binlog_multi_engine.result	2010-06-01 23:25:08 +0000
> +++ b/mysql-test/suite/binlog/r/binlog_multi_engine.result	2010-06-24 03:56:09 +0000
> @@ -7,8 +7,6 @@ SET SESSION BINLOG_FORMAT=STATEMENT;
>  INSERT INTO t1b VALUES (1,1), (1,2), (2,1), (2,2);
>  INSERT INTO t1m VALUES (1,1), (1,2), (2,1), (2,2);
>  UPDATE t1m, t1b SET m = 2, b = 3 WHERE n = c;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  The last event before the COMMIT is use `test`; UPDATE t1m, t1b SET m = 2, b = 3
> WHERE n = c
>  *** Please look in binlog_multi_engine.test if you have a diff here ****
>  START TRANSACTION;
> @@ -73,6 +71,9 @@ mysqld-bin.000001	#	Table_map	#	#	table_
>  mysqld-bin.000001	#	Write_rows	#	#	table_id: #
>  mysqld-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
>  mysqld-bin.000001	#	Query	#	#	COMMIT
> +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	#	#	use `test`; TRUNCATE t1m
>  mysqld-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1b
>  mysqld-bin.000001	#	Query	#	#	use `test`; TRUNCATE t1n
> 
> === modified file 'mysql-test/suite/binlog/r/binlog_stm_binlog.result'
> --- a/mysql-test/suite/binlog/r/binlog_stm_binlog.result	2010-05-26 14:34:25 +0000
> +++ b/mysql-test/suite/binlog/r/binlog_stm_binlog.result	2010-06-24 03:56:09 +0000
> @@ -635,7 +635,9 @@ COERCIBILITY(NAME_CONST('s1', _utf8'test
>  COERCIBILITY(s1) d3;
>  DROP TEMPORARY TABLE tmp1;
>  END
> -master-bin.000001	#	Query	#	#	use `bug39182`; DROP TEMPORARY TABLE IF EXISTS `tmp1`
> /* generated by server */
> +master-bin.000001	#	Query	#	#	use `bug39182`; CREATE TEMPORARY TABLE tmp1
> +SELECT * FROM t1 WHERE a LIKE CONCAT("%",  NAME_CONST('s1',_utf8'test' COLLATE
> 'utf8_unicode_ci'), "%")
> +master-bin.000001	#	Query	#	#	use `bug39182`; DROP TEMPORARY TABLE tmp1
>  DROP PROCEDURE p1;
>  DROP TABLE t1;
>  DROP DATABASE bug39182;
> 
> === modified file 'mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result'
> --- a/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2010-06-01
> 23:25:08 +0000
> +++ b/mysql-test/suite/binlog/r/binlog_stm_mix_innodb_myisam.result	2010-06-24
> 03:56:09 +0000
> @@ -110,8 +110,6 @@ delete from t2;
>  reset master;
>  insert into t1 values(9);
>  insert into t2 select * from t1;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  show binlog events from <binlog_start>;
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> @@ -245,8 +243,6 @@ Warnings:
>  Warning	1196	Some non-transactional changed tables couldn't be rolled back
>  create table t0 (n int);
>  insert t0 select * from t1;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  set autocommit=1;
>  insert into t0 select GET_LOCK("lock1",null);
>  Warnings:
> @@ -288,7 +284,7 @@ master-bin.000001	#	Query	#	#	use `test`
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; insert t1 values (1)
> -master-bin.000001	#	Query	#	#	ROLLBACK
> +master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	use `test`; create table t0 (n int)
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; insert t0 select * from t1
> 
> === modified file 'mysql-test/suite/ndb/r/ndb_binlog_format.result'
> --- a/mysql-test/suite/ndb/r/ndb_binlog_format.result	2010-06-01 23:25:08 +0000
> +++ b/mysql-test/suite/ndb/r/ndb_binlog_format.result	2010-06-24 03:56:09 +0000
> @@ -8,8 +8,6 @@ SET SESSION BINLOG_FORMAT=STATEMENT;
>  INSERT INTO t1 VALUES (1,1), (1,2), (2,1), (2,2);
>  INSERT INTO t2 VALUES (1,1), (1,2), (2,1), (2,2);
>  UPDATE t1, t2 SET m = 2, b = 3 WHERE n = c;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  START TRANSACTION;
>  INSERT INTO t3 VALUES (1,1), (1,2), (2,1), (2,2);
>  UPDATE t1, t3 SET m = 2, e = 3 WHERE n = f;
> 
> === modified file 'mysql-test/suite/rpl/r/rpl_concurrency_error.result'
> --- a/mysql-test/suite/rpl/r/rpl_concurrency_error.result	2010-06-01 23:25:08 +0000
> +++ b/mysql-test/suite/rpl/r/rpl_concurrency_error.result	2010-06-24 03:56:09 +0000
> @@ -29,8 +29,6 @@ UPDATE t SET f = 'magenta 2' WHERE f = '
>  ERROR HY000: Lock wait timeout exceeded; try restarting transaction
>  INSERT INTO t VALUES (5 + (2 * 10),"brown");
>  INSERT INTO n VALUES (now(),"brown");
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  COMMIT;
>  ROLLBACK;
>  Warnings:
> @@ -58,8 +56,6 @@ UPDATE t SET f = 'dark blue 2' WHERE f =
>  ERROR HY000: Lock wait timeout exceeded; try restarting transaction
>  INSERT INTO t VALUES (6 + (2 * 10),"brown");
>  INSERT INTO n VALUES (now(),"brown");
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  COMMIT;
>  COMMIT;
>  show binlog events from <binlog_start>;
> @@ -83,8 +79,6 @@ UPDATE t SET f = 'magenta 1' WHERE f = '
>  ERROR HY000: Lock wait timeout exceeded; try restarting transaction
>  INSERT INTO t VALUES (5 + (1 * 10),"brown");
>  INSERT INTO n VALUES (now(),"brown");
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  COMMIT;
>  ROLLBACK;
>  Warnings:
> @@ -110,8 +104,6 @@ UPDATE t SET f = 'dark blue 1' WHERE f =
>  ERROR HY000: Lock wait timeout exceeded; try restarting transaction
>  INSERT INTO t VALUES (6 + (1 * 10),"brown");
>  INSERT INTO n VALUES (now(),"brown");
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  COMMIT;
>  COMMIT;
>  show binlog events from <binlog_start>;
> 
> === modified file 'mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result'
> --- a/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result	2010-04-28
> 12:47:49 +0000
> +++ b/mysql-test/suite/rpl/r/rpl_mixed_binlog_max_cache_size.result	2010-06-24
> 03:56:09 +0000
> @@ -19,7 +19,7 @@ SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1;
>  START SLAVE SQL_THREAD;
>  *** Single statement on both transactional and non-transactional tables. ***
>  Got one of the listed errors
> -SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 2;
> +SET GLOBAL SQL_SLAVE_SKIP_COUNTER = 1;
>  START SLAVE SQL_THREAD;
>  source include/diff_master_slave.inc;
> 
> ########################################################################################
> 
> === modified file 'mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result'
> --- a/mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result	2010-05-07 09:37:16
> +0000
> +++ b/mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result	2010-06-24 03:56:09
> +0000
> @@ -393,15 +393,13 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id, info) SELECT 23, 1, COUNT(*) FROM tt_1;
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id, info)
> SELECT 23, 1, COUNT(*) FROM tt_1
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> tN << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> tN << -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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id, info)
> SELECT 23, 1, COUNT(*) FROM tt_1
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> tN << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -409,15 +407,13 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO tt_1(trans_id, stmt_id, info) SELECT 24, 1, COUNT(*) FROM nt_1;
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id, info)
> SELECT 24, 1, COUNT(*) FROM nt_1
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> nT << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> nT << -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	#	Table_map	#	#	table_id: # (test.tt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id, info)
> SELECT 24, 1, COUNT(*) FROM nt_1
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> nT << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -425,23 +421,13 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  UPDATE nt_3, tt_3 SET nt_3.info= "new text 25 --> 1", tt_3.info= "new text 25
> --> 1" where nt_3.trans_id = tt_3.trans_id and tt_3.trans_id = 1;
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_3)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_3)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; UPDATE nt_3, tt_3 SET nt_3.info= "new text
> 25 --> 1", tt_3.info= "new text 25 --> 1" where nt_3.trans_id = tt_3.trans_id and
> tt_3.trans_id = 1
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> NT << -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	#	Table_map	#	#	table_id: # (test.nt_3)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_3)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; UPDATE nt_3, tt_3 SET nt_3.info= "new text
> 25 --> 1", tt_3.info= "new text 25 --> 1" where nt_3.trans_id = tt_3.trans_id and
> tt_3.trans_id = 1
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -449,23 +435,13 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  INSERT INTO nt_4(trans_id, stmt_id) VALUES (26, 1);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_4)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_4)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_4(trans_id, stmt_id) VALUES
> (26, 1)
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> NT-trig << -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	#	Table_map	#	#	table_id: # (test.nt_4)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_4)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_4(trans_id, stmt_id) VALUES
> (26, 1)
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -473,35 +449,13 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  INSERT INTO nt_5(trans_id, stmt_id, info) VALUES (27, 1, fc_i_tt_5_suc(27, 1));
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id, info)
> VALUES (27, 1, fc_i_tt_5_suc(27, 1))
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> NT-func << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id, info)
> VALUES (27, 1, fc_i_tt_5_suc(27, 1))
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT-func << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -509,23 +463,13 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  UPDATE tt_4, nt_4 SET tt_4.info= "new text 28 --> 1", nt_4.info= "new text 28
> --> 1" where nt_4.trans_id = tt_4.trans_id and tt_4.trans_id = 1;
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_4)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_4)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; UPDATE tt_4, nt_4 SET tt_4.info= "new text
> 28 --> 1", nt_4.info= "new text 28 --> 1" where nt_4.trans_id = tt_4.trans_id and
> tt_4.trans_id = 1
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> TN << -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	#	Table_map	#	#	table_id: # (test.nt_4)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_4)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; UPDATE tt_4, nt_4 SET tt_4.info= "new text
> 28 --> 1", nt_4.info= "new text 28 --> 1" where nt_4.trans_id = tt_4.trans_id and
> tt_4.trans_id = 1
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -533,23 +477,13 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  INSERT INTO tt_3(trans_id, stmt_id) VALUES (29, 1);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_3)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_3)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_3(trans_id, stmt_id) VALUES
> (29, 1)
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> TN-trig << -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	#	Table_map	#	#	table_id: # (test.nt_3)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_3)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_3(trans_id, stmt_id) VALUES
> (29, 1)
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -557,35 +491,13 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  INSERT INTO tt_5(trans_id, stmt_id, info) VALUES (30, 1, fc_i_nt_5_suc(30, 1));
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id, info)
> VALUES (30, 1, fc_i_nt_5_suc(30, 1))
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> TN-func << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id, info)
> VALUES (30, 1, fc_i_nt_5_suc(30, 1))
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN-func << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -604,15 +516,13 @@ INSERT INTO nt_1(trans_id, stmt_id, info
>  Got one of the listed errors
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id, info)
> SELECT 31, 1, COUNT(*) FROM tt_1 UNION SELECT 23, 1, COUNT(*) FROM tt_1
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> tNe << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> tNe << -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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id, info)
> SELECT 31, 1, COUNT(*) FROM tt_1 UNION SELECT 23, 1, COUNT(*) FROM tt_1
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> tNe << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -630,16 +540,14 @@ INSERT INTO nt_4(trans_id, stmt_id) VALU
>  Got one of the listed errors
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_4)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_4(trans_id, stmt_id) VALUES
> (33, 1), (26, 1)
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> NeT-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> NeT-trig << -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	#	Table_map	#	#	table_id: # (test.nt_4)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_4(trans_id, stmt_id) VALUES
> (33, 1), (26, 1)
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> NeT-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> NeT-func << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -647,20 +555,14 @@ INSERT INTO nt_5(trans_id, stmt_id, info
>  Got one of the listed errors
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id, info)
> VALUES (34, 1, ''), (30, 2, fc_i_tt_5_suc (34, 1))
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> NeT-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> NeT-func << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id, info)
> VALUES (34, 1, ''), (30, 2, fc_i_tt_5_suc (34, 1))
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> NeT-func << -e-e-e-e-e-e-e-e-e-e-e-
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> TeN-trig << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -668,16 +570,14 @@ INSERT INTO tt_3(trans_id, stmt_id) VALU
>  Got one of the listed errors
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_3)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_3(trans_id, stmt_id) VALUES
> (35, 1), (29, 1)
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> TeN-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> TeN-trig << -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	#	Table_map	#	#	table_id: # (test.nt_3)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_3(trans_id, stmt_id) VALUES
> (35, 1), (29, 1)
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> TeN-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> TeN-func << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -685,24 +585,14 @@ INSERT INTO tt_5(trans_id, stmt_id, info
>  Got one of the listed errors
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id, info)
> VALUES (36, 1, ''), (30, 1, fc_i_nt_5_suc (36, 1))
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> TeN-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> TeN-func << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id, info)
> VALUES (36, 1, ''), (30, 1, fc_i_nt_5_suc (36, 1))
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> TeN-func << -e-e-e-e-e-e-e-e-e-e-e-
>  
>  
> @@ -3711,8 +3601,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (133, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (133, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -3725,8 +3614,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T N C << -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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (133, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES
> (133, 2)
> @@ -3745,10 +3633,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (134, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (134, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -3761,10 +3646,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T N-trig C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (134, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES
> (134, 2)
> @@ -3785,12 +3667,7 @@ fc_i_nt_5_suc (135, 4)
>  fc_i_nt_5_suc
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(135,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -3803,12 +3680,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T N-func C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(135,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES
> (135, 2)
> @@ -3827,16 +3699,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (136, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',136),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',136),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -3849,16 +3715,10 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T N-proc C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',136),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',136),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES
> (136, 2)
> @@ -3877,8 +3737,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (137, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (137, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -3891,8 +3750,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-trig N C << -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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (137, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES
> (137, 2)
> @@ -3911,10 +3769,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (138, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (138, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -3927,10 +3782,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-trig N-trig C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (138, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES
> (138, 2)
> @@ -3951,12 +3803,7 @@ fc_i_nt_5_suc (139, 4)
>  fc_i_nt_5_suc
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(139,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -3969,12 +3816,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-trig N-func C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(139,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES
> (139, 2)
> @@ -3993,16 +3835,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (140, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',140),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',140),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -4015,16 +3851,10 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-trig N-proc C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',140),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',140),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES
> (140, 2)
> @@ -4045,8 +3875,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (141, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (141, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -4059,8 +3888,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-func N C << -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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (141, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_tt_5_suc`(141,2)
> @@ -4081,10 +3909,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (142, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (142, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -4097,10 +3922,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-func N-trig C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (142, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_tt_5_suc`(142,2)
> @@ -4123,12 +3945,7 @@ fc_i_nt_5_suc (143, 4)
>  fc_i_nt_5_suc
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(143,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -4141,12 +3958,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-func N-func C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(143,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_tt_5_suc`(143,2)
> @@ -4167,16 +3979,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (144, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',144),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',144),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -4189,16 +3995,10 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-func N-proc C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',144),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',144),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_tt_5_suc`(144,2)
> @@ -4217,8 +4017,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (145, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (145, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -4232,8 +4031,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-proc N C << -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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (145, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',145),  NAME_CONST('in_stmt_id',1))
> @@ -4253,10 +4051,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (146, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (146, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -4270,10 +4065,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-proc N-trig C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (146, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',146),  NAME_CONST('in_stmt_id',1))
> @@ -4295,12 +4087,7 @@ fc_i_nt_5_suc (147, 4)
>  fc_i_nt_5_suc
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(147,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -4314,12 +4101,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-proc N-func C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(147,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',147),  NAME_CONST('in_stmt_id',1))
> @@ -4339,16 +4121,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (148, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',148),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',148),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -4362,16 +4138,10 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-proc N-proc C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',148),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',148),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',148),  NAME_CONST('in_stmt_id',1))
> @@ -4487,8 +4257,7 @@ INSERT INTO nt_1(trans_id, stmt_id) VALU
>  Got one of the listed errors
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (152, 4), (150, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> Ne << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -4501,8 +4270,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T Ne C << -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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (152, 4), (150, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES
> (152, 2)
> @@ -4531,8 +4299,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (153, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (153, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -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-
> @@ -4544,8 +4311,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T N 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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (153, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T N R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -4561,10 +4327,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (154, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (154, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -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-
> @@ -4576,10 +4339,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T N-trig 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (154, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T N-trig R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -4597,12 +4357,7 @@ fc_i_nt_5_suc (155, 4)
>  fc_i_nt_5_suc
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(155,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-func << -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-
> @@ -4614,12 +4369,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T N-func 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(155,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T N-func R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -4635,16 +4385,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (156, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',156),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',156),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -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-
> @@ -4656,16 +4400,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T N-proc 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',156),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',156),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T N-proc R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -4681,8 +4419,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (157, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (157, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -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-
> @@ -4694,8 +4431,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-trig N 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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (157, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T-trig N R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -4711,10 +4447,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (158, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (158, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -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-
> @@ -4726,10 +4459,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-trig N-trig 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (158, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T-trig N-trig R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -4747,12 +4477,7 @@ fc_i_nt_5_suc (159, 4)
>  fc_i_nt_5_suc
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(159,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-func << -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-
> @@ -4764,12 +4489,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-trig N-func 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(159,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T-trig N-func R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -4785,16 +4505,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (160, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',160),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',160),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -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-
> @@ -4806,16 +4520,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-trig N-proc 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',160),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',160),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T-trig N-proc R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -4833,8 +4541,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (161, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (161, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -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-
> @@ -4846,8 +4553,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-func N 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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (161, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T-func N R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -4865,10 +4571,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (162, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (162, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -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-
> @@ -4880,10 +4583,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-func N-trig 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (162, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T-func N-trig R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -4903,12 +4603,7 @@ fc_i_nt_5_suc (163, 4)
>  fc_i_nt_5_suc
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(163,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-func << -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-
> @@ -4916,16 +4611,11 @@ ROLLBACK;
>  Warnings:
>  Warning	1196	Some non-transactional changed tables couldn't be rolled back
>  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-func N-func 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +-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-func N-func 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`; SELECT `test`.`fc_i_nt_5_suc`(163,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T-func N-func R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -4943,16 +4633,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (164, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',164),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',164),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -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-
> @@ -4964,16 +4648,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-func N-proc 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',164),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',164),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T-func N-proc R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -4989,8 +4667,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (165, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (165, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -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-
> @@ -5002,8 +4679,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-proc N 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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (165, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T-proc N R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -5019,10 +4695,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (166, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (166, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-trig << -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-
> @@ -5034,10 +4707,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-proc N-trig 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (166, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T-proc N-trig R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -5055,12 +4725,7 @@ fc_i_nt_5_suc (167, 4)
>  fc_i_nt_5_suc
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(167,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-func << -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-
> @@ -5072,12 +4737,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-proc N-func 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_nt_5_suc`(167,4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T-proc N-func R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -5093,16 +4753,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (168, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',168),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',168),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -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-
> @@ -5114,16 +4768,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T-proc N-proc 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',168),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',168),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T-proc N-proc R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -5233,8 +4881,7 @@ INSERT INTO nt_1(trans_id, stmt_id) VALU
>  Got one of the listed errors
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (172, 4), (170, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> Ne << -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-
> @@ -5246,8 +4893,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T Ne 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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (172, 4), (170, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B T Ne R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -5673,16 +5319,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (185, 2);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',185),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',185),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -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-
> @@ -5699,16 +5339,10 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B N-proc T C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',185),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',185),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES
> (185, 4)
> @@ -5723,16 +5357,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (186, 2);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',186),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',186),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> T-trig << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -5749,16 +5377,10 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B N-proc T-trig C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',186),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',186),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES
> (186, 4)
> @@ -5773,16 +5395,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (187, 2);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',187),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',187),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> T-func << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -5801,16 +5417,10 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B N-proc T-func C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',187),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',187),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; SELECT `test`.`fc_i_tt_5_suc`(187,4)
> @@ -5825,16 +5435,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (188, 2);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',188),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',188),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> T-proc << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -5852,16 +5456,10 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B N-proc T-proc C << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',188),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',188),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',188),  NAME_CONST('in_stmt_id',1))
> @@ -6237,16 +5835,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (201, 2);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',201),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',201),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -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-
> @@ -6262,16 +5854,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B N-proc 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',201),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',201),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B N-proc T R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -6283,16 +5869,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (202, 2);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',202),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',202),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> T-proc << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -6308,16 +5888,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B N-proc T-proc 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',202),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',202),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B N-proc T-proc R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -6329,16 +5903,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (203, 2);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',203),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',203),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> T-trig << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -6354,16 +5922,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B N-proc T-trig 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',203),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',203),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B N-proc T-trig R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -6375,16 +5937,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  CALL pc_i_nt_5_suc (204, 2);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',204),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',204),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> T-func << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -6402,16 +5958,10 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B N-proc T-func 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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',204),  NAME_CONST('in_stmt_id',1))
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> ( NAME_CONST('p_trans_id',204),  NAME_CONST('in_stmt_id',1) + 1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B N-proc T-func R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -8477,8 +8027,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (262, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (262, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -8492,8 +8041,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B nT N C << -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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (262, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
> @@ -8517,8 +8065,7 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (263, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (263, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -8536,8 +8083,7 @@ master-bin.000001	#	Table_map	#	#	table_
>  master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (263, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_3)
> @@ -8561,8 +8107,7 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (264, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (264, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -8580,8 +8125,7 @@ master-bin.000001	#	Table_map	#	#	table_
>  master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (264, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_4)
> @@ -8607,8 +8151,7 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (265, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (265, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -8632,8 +8175,7 @@ master-bin.000001	#	Write_rows	#	#	table
>  master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (265, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
> @@ -8661,8 +8203,7 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (266, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (266, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -8680,8 +8221,7 @@ master-bin.000001	#	Table_map	#	#	table_
>  master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (266, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_4)
> @@ -8705,8 +8245,7 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (267, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (267, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -8724,8 +8263,7 @@ master-bin.000001	#	Table_map	#	#	table_
>  master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (267, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_3)
> @@ -8753,8 +8291,7 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (268, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (268, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> C << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -8778,8 +8315,7 @@ master-bin.000001	#	Write_rows	#	#	table
>  master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (268, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
> @@ -9075,8 +8611,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (276, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (276, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -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-
> @@ -9088,8 +8623,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -b-b-b-b-b-b-b-b-b-b-b- >> B nT N 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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (276, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B nT N R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -9109,8 +8643,7 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (277, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (277, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -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-
> @@ -9126,8 +8659,7 @@ master-bin.000001	#	Table_map	#	#	table_
>  master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (277, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B NT N R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -9147,8 +8679,7 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (278, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (278, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -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-
> @@ -9164,8 +8695,7 @@ master-bin.000001	#	Table_map	#	#	table_
>  master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (278, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B NT-trig N R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -9187,8 +8717,7 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (279, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (279, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -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-
> @@ -9206,8 +8735,7 @@ master-bin.000001	#	Write_rows	#	#	table
>  master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (279, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B NT-func N R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -9227,8 +8755,7 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (280, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (280, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -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-
> @@ -9244,8 +8771,7 @@ master-bin.000001	#	Table_map	#	#	table_
>  master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (280, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B TN N R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -9265,8 +8791,7 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (281, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (281, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -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-
> @@ -9282,8 +8807,7 @@ master-bin.000001	#	Table_map	#	#	table_
>  master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (281, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B TN-trig N R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -9307,8 +8831,7 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (282, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (282, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -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-
> @@ -9328,8 +8851,7 @@ master-bin.000001	#	Write_rows	#	#	table
>  master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (282, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> B TN-func N R << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -10792,8 +10314,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (319, 4);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (319, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> S1 << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -10823,8 +10344,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T N S1 T R1 C << -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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (319, 4)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES
> (319, 2)
> @@ -10850,8 +10370,7 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (320, 5);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (320, 5)
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> N << -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-
> @@ -10877,8 +10396,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  -b-b-b-b-b-b-b-b-b-b-b- >> B T S1 N T R1 C << -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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (320, 5)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES
> (320, 2)
> 
> === modified file
> 'mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result'
> --- a/mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result	2010-05-07
> 09:37:16 +0000
> +++ b/mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result	2010-06-24
> 03:56:09 +0000
> @@ -393,15 +393,13 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO nt_1(trans_id, stmt_id, info) SELECT 23, 1, COUNT(*) FROM tt_1;
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id, info)
> SELECT 23, 1, COUNT(*) FROM tt_1
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> tN << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> tN << -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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id, info)
> SELECT 23, 1, COUNT(*) FROM tt_1
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> tN << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -409,15 +407,13 @@ master-bin.000001	#	Query	#	#	COMMIT
>  INSERT INTO tt_1(trans_id, stmt_id, info) SELECT 24, 1, COUNT(*) FROM nt_1;
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id, info)
> SELECT 24, 1, COUNT(*) FROM nt_1
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> nT << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> nT << -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	#	Table_map	#	#	table_id: # (test.tt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id, info)
> SELECT 24, 1, COUNT(*) FROM nt_1
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> nT << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -425,23 +421,13 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  UPDATE nt_3, tt_3 SET nt_3.info= "new text 25 --> 1", tt_3.info= "new text 25
> --> 1" where nt_3.trans_id = tt_3.trans_id and tt_3.trans_id = 1;
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_3)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_3)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; UPDATE nt_3, tt_3 SET nt_3.info= "new text
> 25 --> 1", tt_3.info= "new text 25 --> 1" where nt_3.trans_id = tt_3.trans_id and
> tt_3.trans_id = 1
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> NT << -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	#	Table_map	#	#	table_id: # (test.nt_3)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_3)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; UPDATE nt_3, tt_3 SET nt_3.info= "new text
> 25 --> 1", tt_3.info= "new text 25 --> 1" where nt_3.trans_id = tt_3.trans_id and
> tt_3.trans_id = 1
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -449,23 +435,13 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  INSERT INTO nt_4(trans_id, stmt_id) VALUES (26, 1);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_4)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_4)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_4(trans_id, stmt_id) VALUES
> (26, 1)
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> NT-trig << -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	#	Table_map	#	#	table_id: # (test.nt_4)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_4)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_4(trans_id, stmt_id) VALUES
> (26, 1)
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -473,35 +449,13 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  INSERT INTO nt_5(trans_id, stmt_id, info) VALUES (27, 1, fc_i_tt_5_suc(27, 1));
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id, info)
> VALUES (27, 1, fc_i_tt_5_suc(27, 1))
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> NT-func << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id, info)
> VALUES (27, 1, fc_i_tt_5_suc(27, 1))
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT-func << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -509,23 +463,13 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  UPDATE tt_4, nt_4 SET tt_4.info= "new text 28 --> 1", nt_4.info= "new text 28
> --> 1" where nt_4.trans_id = tt_4.trans_id and tt_4.trans_id = 1;
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_4)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_4)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; UPDATE tt_4, nt_4 SET tt_4.info= "new text
> 28 --> 1", nt_4.info= "new text 28 --> 1" where nt_4.trans_id = tt_4.trans_id and
> tt_4.trans_id = 1
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> TN << -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	#	Table_map	#	#	table_id: # (test.nt_4)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_4)
> -master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; UPDATE tt_4, nt_4 SET tt_4.info= "new text
> 28 --> 1", nt_4.info= "new text 28 --> 1" where nt_4.trans_id = tt_4.trans_id and
> tt_4.trans_id = 1
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -533,23 +477,13 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  INSERT INTO tt_3(trans_id, stmt_id) VALUES (29, 1);
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_3)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_3)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_3(trans_id, stmt_id) VALUES
> (29, 1)
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> TN-trig << -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	#	Table_map	#	#	table_id: # (test.nt_3)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_3)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_3(trans_id, stmt_id) VALUES
> (29, 1)
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -557,35 +491,13 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  INSERT INTO tt_5(trans_id, stmt_id, info) VALUES (30, 1, fc_i_nt_5_suc(30, 1));
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id, info)
> VALUES (30, 1, fc_i_nt_5_suc(30, 1))
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> TN-func << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> -master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id, info)
> VALUES (30, 1, fc_i_nt_5_suc(30, 1))
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN-func << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -604,15 +516,13 @@ INSERT INTO nt_1(trans_id, stmt_id, info
>  Got one of the listed errors
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id, info)
> SELECT 31, 1, COUNT(*) FROM tt_1 UNION SELECT 23, 1, COUNT(*) FROM tt_1
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> tNe << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> tNe << -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	#	Table_map	#	#	table_id: # (test.nt_1)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id, info)
> SELECT 31, 1, COUNT(*) FROM tt_1 UNION SELECT 23, 1, COUNT(*) FROM tt_1
>  master-bin.000001	#	Query	#	#	COMMIT
>  -e-e-e-e-e-e-e-e-e-e-e- >> tNe << -e-e-e-e-e-e-e-e-e-e-e-
>  
> @@ -630,16 +540,14 @@ INSERT INTO nt_4(trans_id, stmt_id) VALU
>  Got one of the listed errors
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_4)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_4(trans_id, stmt_id) VALUES
> (33, 1), (26, 1)
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> NeT-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> NeT-trig << -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	#	Table_map	#	#	table_id: # (test.nt_4)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_4(trans_id, stmt_id) VALUES
> (33, 1), (26, 1)
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> NeT-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> NeT-func << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -647,20 +555,14 @@ INSERT INTO nt_5(trans_id, stmt_id, info
>  Got one of the listed errors
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id, info)
> VALUES (34, 1, ''), (30, 2, fc_i_tt_5_suc (34, 1))
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> NeT-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> NeT-func << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id, info)
> VALUES (34, 1, ''), (30, 2, fc_i_tt_5_suc (34, 1))
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> NeT-func << -e-e-e-e-e-e-e-e-e-e-e-
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> TeN-trig << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -668,16 +570,14 @@ INSERT INTO tt_3(trans_id, stmt_id) VALU
>  Got one of the listed errors
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_3)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_3(trans_id, stmt_id) VALUES
> (35, 1), (29, 1)
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> TeN-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> TeN-trig << -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	#	Table_map	#	#	table_id: # (test.nt_3)
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_3(trans_id, stmt_id) VALUES
> (35, 1), (29, 1)
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> TeN-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> TeN-func << -b-b-b-b-b-b-b-b-b-b-b-
> @@ -685,24 +585,14 @@ INSERT INTO tt_5(trans_id, stmt_id, info
>  Got one of the listed errors
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id, info)
> VALUES (36, 1, ''), (30, 1, fc_i_nt_5_suc (36, 1))
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> TeN-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> TeN-func << -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	#	Table_map	#	#	table_id: # (test.nt_5)
> -master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_6)
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: #
> -master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
> -master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_5(trans_id, stmt_id, info)
> VALUES (36, 1, ''), (30, 1, fc_i_nt_5_suc (36, 1))
> +master-bin.000001	#	Query	#	#	ROLLBACK
>  -e-e-e-e-e-e-e-e-e-e-e- >> TeN-func << -e-e-e-e-e-e-e-e-e-e-e-
>  
>  
> 
> === modified file 'mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result'
> --- a/mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result	2010-06-01
> 23:25:08 +0000
> +++ b/mysql-test/suite/rpl/r/rpl_non_direct_stm_mixing_engines.result	2010-06-24
> 03:56:09 +0000
> @@ -391,8 +391,6 @@ master-bin.000001	#	Query	#	#	COMMIT
>  #
>  -b-b-b-b-b-b-b-b-b-b-b- >> tN << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id, info) SELECT 23, 1, COUNT(*) FROM tt_1;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id, info)
> SELECT 23, 1, COUNT(*) FROM tt_1
> @@ -407,8 +405,6 @@ master-bin.000001	#	Query	#	#	COMMIT
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> nT << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO tt_1(trans_id, stmt_id, info) SELECT 24, 1, COUNT(*) FROM nt_1;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  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(trans_id, stmt_id, info)
> SELECT 24, 1, COUNT(*) FROM nt_1
> @@ -423,8 +419,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> NT << -b-b-b-b-b-b-b-b-b-b-b-
>  UPDATE nt_3, tt_3 SET nt_3.info= "new text 25 --> 1", tt_3.info= "new text 25
> --> 1" where nt_3.trans_id = tt_3.trans_id and tt_3.trans_id = 1;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; UPDATE nt_3, tt_3 SET nt_3.info= "new text
> 25 --> 1", tt_3.info= "new text 25 --> 1" where nt_3.trans_id = tt_3.trans_id and
> tt_3.trans_id = 1
> @@ -439,8 +433,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> NT-trig << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_4(trans_id, stmt_id) VALUES (26, 1);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_4(trans_id, stmt_id) VALUES
> (26, 1)
> @@ -455,8 +447,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> NT-func << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_5(trans_id, stmt_id, info) VALUES (27, 1, fc_i_tt_5_suc(27, 1));
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id, info)
> VALUES (27, 1, fc_i_tt_5_suc(27, 1))
> @@ -471,8 +461,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> TN << -b-b-b-b-b-b-b-b-b-b-b-
>  UPDATE tt_4, nt_4 SET tt_4.info= "new text 28 --> 1", nt_4.info= "new text 28
> --> 1" where nt_4.trans_id = tt_4.trans_id and tt_4.trans_id = 1;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; UPDATE tt_4, nt_4 SET tt_4.info= "new text
> 28 --> 1", nt_4.info= "new text 28 --> 1" where nt_4.trans_id = tt_4.trans_id and
> tt_4.trans_id = 1
> @@ -487,8 +475,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> TN-trig << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO tt_3(trans_id, stmt_id) VALUES (29, 1);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  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_3(trans_id, stmt_id) VALUES
> (29, 1)
> @@ -503,8 +489,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> TN-func << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO tt_5(trans_id, stmt_id, info) VALUES (30, 1, fc_i_nt_5_suc(30, 1));
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  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_5(trans_id, stmt_id, info)
> VALUES (30, 1, fc_i_nt_5_suc(30, 1))
> 
> === modified file 'mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result'
> --- a/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result	2010-04-28 12:47:49
> +0000
> +++ b/mysql-test/suite/rpl/r/rpl_stm_binlog_max_cache_size.result	2010-06-24 03:56:09
> +0000
> @@ -32,18 +32,12 @@ BEGIN;
>  Got one of the listed errors
>  Got one of the listed errors
>  Got one of the listed errors
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  BEGIN;
>  Got one of the listed errors
>  Got one of the listed errors
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  BEGIN;
>  Got one of the listed errors
>  Got one of the listed errors
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  source include/diff_master_slave.inc;
> 
> ########################################################################################
>  #                                     3 - BEGIN - COMMIT
> @@ -55,8 +49,6 @@ BEGIN;
>  Got one of the listed errors
>  Got one of the listed errors
>  Got one of the listed errors
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  COMMIT;
>  source include/diff_master_slave.inc;
> 
> ########################################################################################
> @@ -69,8 +61,6 @@ BEGIN;
>  Got one of the listed errors
>  Got one of the listed errors
>  Got one of the listed errors
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  ROLLBACK;
>  Warnings:
>  Warning	1196	Some non-transactional changed tables couldn't be rolled back
> @@ -109,8 +99,6 @@ BEGIN;
>  Got one of the listed errors
>  Got one of the listed errors
>  Got one of the listed errors
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  ROLLBACK TO sv;
>  Warnings:
>  Warning	1196	Some non-transactional changed tables couldn't be rolled back
> @@ -123,19 +111,11 @@ TRUNCATE TABLE t1;
>  TRUNCATE TABLE t2;
>  TRUNCATE TABLE t3;
>  BEGIN;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Got one of the listed errors
>  Got one of the listed errors
>  Got one of the listed errors
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  COMMIT;
>  BEGIN;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Got one of the listed errors
>  COMMIT;
>  source include/diff_master_slave.inc;
> 
> === modified file 'mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result'
> --- a/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result	2010-06-01 23:25:08 +0000
> +++ b/mysql-test/suite/rpl/r/rpl_stm_mixing_engines.result	2010-06-24 03:56:09 +0000
> @@ -391,8 +391,6 @@ master-bin.000001	#	Query	#	#	COMMIT
>  #
>  -b-b-b-b-b-b-b-b-b-b-b- >> tN << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id, info) SELECT 23, 1, COUNT(*) FROM tt_1;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id, info)
> SELECT 23, 1, COUNT(*) FROM tt_1
> @@ -407,8 +405,6 @@ master-bin.000001	#	Query	#	#	COMMIT
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> nT << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO tt_1(trans_id, stmt_id, info) SELECT 24, 1, COUNT(*) FROM nt_1;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  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(trans_id, stmt_id, info)
> SELECT 24, 1, COUNT(*) FROM nt_1
> @@ -423,8 +419,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> NT << -b-b-b-b-b-b-b-b-b-b-b-
>  UPDATE nt_3, tt_3 SET nt_3.info= "new text 25 --> 1", tt_3.info= "new text 25
> --> 1" where nt_3.trans_id = tt_3.trans_id and tt_3.trans_id = 1;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; UPDATE nt_3, tt_3 SET nt_3.info= "new text
> 25 --> 1", tt_3.info= "new text 25 --> 1" where nt_3.trans_id = tt_3.trans_id and
> tt_3.trans_id = 1
> @@ -439,8 +433,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> NT-trig << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_4(trans_id, stmt_id) VALUES (26, 1);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_4(trans_id, stmt_id) VALUES
> (26, 1)
> @@ -455,8 +447,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> NT-func << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_5(trans_id, stmt_id, info) VALUES (27, 1, fc_i_tt_5_suc(27, 1));
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id, info)
> VALUES (27, 1, fc_i_tt_5_suc(27, 1))
> @@ -471,8 +461,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> TN << -b-b-b-b-b-b-b-b-b-b-b-
>  UPDATE tt_4, nt_4 SET tt_4.info= "new text 28 --> 1", nt_4.info= "new text 28
> --> 1" where nt_4.trans_id = tt_4.trans_id and tt_4.trans_id = 1;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; UPDATE tt_4, nt_4 SET tt_4.info= "new text
> 28 --> 1", nt_4.info= "new text 28 --> 1" where nt_4.trans_id = tt_4.trans_id and
> tt_4.trans_id = 1
> @@ -487,8 +475,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> TN-trig << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO tt_3(trans_id, stmt_id) VALUES (29, 1);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  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_3(trans_id, stmt_id) VALUES
> (29, 1)
> @@ -503,8 +489,6 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  
>  -b-b-b-b-b-b-b-b-b-b-b- >> TN-func << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO tt_5(trans_id, stmt_id, info) VALUES (30, 1, fc_i_nt_5_suc(30, 1));
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  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_5(trans_id, stmt_id, info)
> VALUES (30, 1, fc_i_nt_5_suc(30, 1))
> @@ -3615,8 +3599,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (133, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (133, 4)
> @@ -3649,8 +3631,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N-trig << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (134, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (134, 4)
> @@ -3755,8 +3735,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (137, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (137, 4)
> @@ -3789,8 +3767,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N-trig << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (138, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (138, 4)
> @@ -3897,8 +3873,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (141, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (141, 4)
> @@ -3933,8 +3907,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N-trig << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (142, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (142, 4)
> @@ -4043,8 +4015,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (145, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (145, 4)
> @@ -4079,8 +4049,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N-trig << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (146, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (146, 4)
> @@ -4329,8 +4297,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (153, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (153, 4)
> @@ -4365,8 +4331,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N-trig << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (154, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (154, 4)
> @@ -4477,8 +4441,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (157, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (157, 4)
> @@ -4513,8 +4475,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N-trig << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (158, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (158, 4)
> @@ -4627,8 +4587,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (161, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (161, 4)
> @@ -4665,8 +4623,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N-trig << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (162, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (162, 4)
> @@ -4781,8 +4737,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (165, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (165, 4)
> @@ -4819,8 +4773,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T-proc << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N-trig << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_5(trans_id, stmt_id) VALUES (166, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_5(trans_id, stmt_id) VALUES
> (166, 4)
> @@ -8069,8 +8021,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> nT << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (262, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (262, 4)
> @@ -8105,8 +8055,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (263, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (263, 4)
> @@ -8141,8 +8089,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (264, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (264, 4)
> @@ -8177,8 +8123,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (265, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (265, 4)
> @@ -8213,8 +8157,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (266, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (266, 4)
> @@ -8249,8 +8191,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (267, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (267, 4)
> @@ -8285,8 +8225,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (268, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (268, 4)
> @@ -8392,8 +8330,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> NeT-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (271, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (271, 4)
> @@ -8427,8 +8363,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> NeT-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (272, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (272, 4)
> @@ -8462,8 +8396,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> TeN-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (273, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (273, 4)
> @@ -8497,8 +8429,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> TeN-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (274, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (274, 4)
> @@ -8581,8 +8511,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> nT << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (276, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (276, 4)
> @@ -8619,8 +8547,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (277, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (277, 4)
> @@ -8657,8 +8583,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (278, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (278, 4)
> @@ -8695,8 +8619,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> NT-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (279, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (279, 4)
> @@ -8733,8 +8655,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (280, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (280, 4)
> @@ -8771,8 +8691,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (281, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (281, 4)
> @@ -8809,8 +8727,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> TN-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (282, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (282, 4)
> @@ -8922,8 +8838,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> NeT-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (285, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (285, 4)
> @@ -8959,8 +8873,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> NeT-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (286, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (286, 4)
> @@ -8996,8 +8908,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> TeN-trig << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (287, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (287, 4)
> @@ -9033,8 +8943,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> TeN-func << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (288, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (288, 4)
> @@ -10158,8 +10066,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> T << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (319, 4);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (319, 4)
> @@ -10216,8 +10122,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  -e-e-e-e-e-e-e-e-e-e-e- >> S1 << -e-e-e-e-e-e-e-e-e-e-e-
>  -b-b-b-b-b-b-b-b-b-b-b- >> N << -b-b-b-b-b-b-b-b-b-b-b-
>  INSERT INTO nt_1(trans_id, stmt_id) VALUES (320, 5);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES
> (320, 5)
> @@ -10949,7 +10853,6 @@ Log_name	Pos	Event_type	Server_id	End_lo
>  INSERT INTO nt_xx_10(trans_id, stmt_id, info) SELECT trans_id, stmt_id, USER() FROM
> nt_1;;
>  Warnings:
>  Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it uses a system function that may
> return a different value on the slave.
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  Log_name	Pos	Event_type	Server_id	End_log_pos	Info
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_10(trans_id, stmt_id,
> info) SELECT trans_id, stmt_id, USER() FROM nt_1
> 
> === modified file 'mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result'
> --- a/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result	2010-06-01 23:25:08
> +0000
> +++ b/mysql-test/suite/rpl/r/rpl_stm_stop_middle_group.result	2010-06-24 03:56:09
> +0000
> @@ -52,8 +52,6 @@ include/start_slave.inc
>  set @@global.debug="+d,stop_slave_middle_group";
>  set @@global.debug="+d,incomplete_group_in_relay_log";
>  update tm as t1, ti as t2 set t1.a=t1.a * 2, t2.a=t2.a * 2;
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  SELECT "Fatal error: ... The slave SQL is stopped, leaving the current group of
> events unfinished with a non-transaction table changed. If the group consists solely of
> Row-based events, you can try restarting the slave with --slave-exec-mode=IDEMPOTENT,
> which ignores duplicate key, key not found, and similar errors (see documentation for
> details)." AS Last_SQL_Error, @check as `true`;
>  Last_SQL_Error	true
>  Fatal error: ... The slave SQL is stopped, leaving the current group of events
> unfinished with a non-transaction table changed. If the group consists solely of Row-based
> events, you can try restarting the slave with --slave-exec-mode=IDEMPOTENT, which ignores
> duplicate key, key not found, and similar errors (see documentation for details).	1
> 
> === modified file 'mysql-test/suite/rpl/r/rpl_temp_temporary.result'
> --- a/mysql-test/suite/rpl/r/rpl_temp_temporary.result	2010-06-01 23:25:08 +0000
> +++ b/mysql-test/suite/rpl/r/rpl_temp_temporary.result	2010-06-24 03:56:09 +0000
> @@ -23,9 +23,9 @@ CREATE TEMPORARY TABLE t_innodb_temp(id 
>  INSERT INTO t_innodb_temp VALUES(1);
>  BEGIN;
>  INSERT INTO t_myisam SELECT * FROM t_myisam_temp;
> +INSERT INTO t_innodb SELECT * FROM t_myisam_temp;
>  Warnings:
>  Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
> -INSERT INTO t_innodb SELECT * FROM t_myisam_temp;
>  INSERT INTO t_innodb SELECT * FROM t_innodb_temp;
>  ROLLBACK;
>  Warnings:
> @@ -35,6 +35,8 @@ INSERT INTO t_myisam SELECT * FROM t_inn
>  Warnings:
>  Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  INSERT INTO t_innodb SELECT * FROM t_myisam_temp;
> +Warnings:
> +Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement accesses nontransactional table as well as
> transactional or temporary table, and writes to any of them.
>  INSERT INTO t_innodb SELECT * FROM t_innodb_temp;
>  ROLLBACK;
>  Warnings:
> @@ -61,11 +63,15 @@ 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 t_myisam SELECT * FROM
> t_myisam_temp
> +master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t_innodb SELECT * FROM
> t_myisam_temp
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t_innodb SELECT * FROM
> t_innodb_temp
>  master-bin.000001	#	Query	#	#	ROLLBACK
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t_myisam SELECT * FROM
> t_innodb_temp
> +master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t_innodb SELECT * FROM
> t_myisam_temp
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t_innodb SELECT * FROM
> t_innodb_temp
>  master-bin.000001	#	Query	#	#	ROLLBACK
> @@ -185,12 +191,8 @@ BEGIN;
>  INSERT INTO t_myisam VALUES(CONNECTION_ID());
>  INSERT INTO tmp1 VALUES(1);
>  INSERT INTO t_myisam VALUES(1);
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  INSERT INTO t_innodb VALUES(1);
>  INSERT INTO t_myisam VALUES(CONNECTION_ID());
> -Warnings:
> -Note	1592	Unsafe statement written to the binary log using statement format since
> BINLOG_FORMAT = STATEMENT. Statement is unsafe because it accesses a non-transactional
> table after accessing a transactional table within the same transaction.
>  INSERT INTO t_innodb VALUES(1);
>  COMMIT;
>  show binlog events from <binlog_start>;
> @@ -202,13 +204,15 @@ master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t_myisam
> VALUES(CONNECTION_ID())
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> +master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tmp1 VALUES(1)
> +master-bin.000001	#	Query	#	#	COMMIT
> +master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t_myisam VALUES(1)
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t_myisam
> VALUES(CONNECTION_ID())
>  master-bin.000001	#	Query	#	#	COMMIT
>  master-bin.000001	#	Query	#	#	BEGIN
> -master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tmp1 VALUES(1)
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t_innodb VALUES(1)
>  master-bin.000001	#	Query	#	#	use `test`; INSERT INTO t_innodb VALUES(1)
>  master-bin.000001	#	Xid	#	#	COMMIT /* XID */
> @@ -216,6 +220,7 @@ master-bin.000001	#	Xid	#	#	COMMIT /* XI
>  #                           VERIFY ITEM 8
>  ########################################################################
>  SET BINLOG_FORMAT=MIXED;
> +SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
>  BEGIN;
>  CREATE TEMPORARY TABLE tmp2 SELECT * FROM t_innodb;
>  INSERT INTO t_innodb VALUES(1);
> 
> === modified file 'mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test'
> --- a/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test	2010-03-31
> 13:49:20 +0000
> +++ b/mysql-test/suite/rpl/t/rpl_non_direct_mixed_mixing_engines.test	2010-06-24
> 03:56:09 +0000
> @@ -11,5 +11,3 @@ SET SESSION binlog_direct_non_transactio
>  --enable_query_log
>  let $engine_type=Innodb;
>  --source extra/rpl_tests/rpl_mixing_engines.test
> -
> ---diff_files suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result
> suite/rpl/r/rpl_mixed_mixing_engines.result
> 
> === modified file 'mysql-test/suite/rpl/t/rpl_temp_temporary.test'
> --- a/mysql-test/suite/rpl/t/rpl_temp_temporary.test	2010-06-01 14:39:07 +0000
> +++ b/mysql-test/suite/rpl/t/rpl_temp_temporary.test	2010-06-24 03:56:09 +0000
> @@ -199,6 +199,7 @@ source include/show_binlog_events.inc;
>  # behalf of the transaction presented below:
>  #
>  SET BINLOG_FORMAT=MIXED;
> +SET TRANSACTION ISOLATION LEVEL SERIALIZABLE;
>  let $binlog_start= query_get_value("SHOW MASTER STATUS", Position, 1);
>  BEGIN;
>  CREATE TEMPORARY TABLE tmp2 SELECT * FROM t_innodb;
> 
> === modified file 'sql/log.cc'
> --- a/sql/log.cc	2010-06-06 11:19:29 +0000
> +++ b/sql/log.cc	2010-06-24 03:56:09 +0000
> @@ -1772,13 +1772,18 @@ static int binlog_rollback(handlerton *h
>      /*
>        We flush the cache wrapped in a beging/rollback if:
>          . aborting a single or multi-statement transaction and;
> +        . the OPTION_KEEP_LOG is activate or;

typo: activate - Either "is active" or "has been activated"

>          . the format is STMT and non-trans engines were updated or;
> -        . the OPTION_KEEP_LOG is activate.
> +        . the format is MIXED, non-trans engines were updated and
> +          aborting a single statement transaction;
>      */
>      if (ending_trans(thd, all) &&
>          ((thd->variables.option_bits & OPTION_KEEP_LOG) ||
>           (trans_has_updated_non_trans_table(thd) &&
> -          thd->variables.binlog_format == BINLOG_FORMAT_STMT)))
> +          thd->variables.binlog_format == BINLOG_FORMAT_STMT) ||
> +         (trans_has_updated_non_trans_table(thd) &&
> +          ending_single_stmt_trans(thd,all) && 
> +          thd->variables.binlog_format == BINLOG_FORMAT_MIXED)))
>      {
>        Query_log_event qev(thd, STRING_WITH_LEN("ROLLBACK"), TRUE, FALSE, TRUE, 0);
>        error= binlog_flush_trx_cache(thd, cache_mngr, &qev);
> @@ -4254,7 +4259,23 @@ bool use_trans_cache(const THD* thd, boo
>  */
>  bool ending_trans(THD* thd, const bool all)
>  {
> -  return (all || (!all && !thd->in_multi_stmt_transaction_mode()));
> +  return (all || ending_single_stmt_trans(thd, all));
> +}
> +
> +/**
> +  This function checks if a single statement transaction is about
> +  to commit or not.
> +
> +  @param thd The client thread that executed the current statement.
> +  @param all Committing a transaction (i.e. TRUE) or a statement
> +             (i.e. FALSE).
> +  @return
> +    @c true if committing a single statement transaction, otherwise
> +    @c false.
> +*/
> +bool ending_single_stmt_trans(THD* thd, const bool all)
> +{
> +  return (!all && !thd->in_multi_stmt_transaction_mode());
>  }
>  
>  /**
> 
> === modified file 'sql/log.h'
> --- a/sql/log.h	2010-06-06 11:19:29 +0000
> +++ b/sql/log.h	2010-06-24 03:56:09 +0000
> @@ -27,6 +27,7 @@ bool trans_has_updated_trans_table(const
>  bool stmt_has_updated_trans_table(const THD *thd);
>  bool use_trans_cache(const THD* thd, bool is_transactional);
>  bool ending_trans(THD* thd, const bool all);
> +bool ending_single_stmt_trans(THD* thd, const bool all);
>  bool trans_has_updated_non_trans_table(const THD* thd);
>  bool stmt_has_updated_non_trans_table(const THD* thd);
>  
> 
> === modified file 'sql/sql_class.cc'
> --- a/sql/sql_class.cc	2010-06-17 13:31:51 +0000
> +++ b/sql/sql_class.cc	2010-06-24 03:56:09 +0000
> @@ -3663,7 +3663,7 @@ int THD::decide_logging_format(TABLE_LIS
>        capabilities.
>      */
>      handler::Table_flags flags_write_some_set= 0;
> -    handler::Table_flags flags_some_set= 0;
> +    handler::Table_flags flags_access_some_set= 0;
>      handler::Table_flags flags_write_all_set=
>        HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE;
>  
> @@ -3679,16 +3679,24 @@ int THD::decide_logging_format(TABLE_LIS
>      */
>      my_bool multi_access_engine= FALSE;
>      /*
> -       If non-transactional and transactional engines are about
> -       to be accessed and any of them is about to be updated.
> -       For example: Innodb and MyIsam.
> +       If a transactional engine is about to be read. Note that
> +       a write implies a read.
>      */
> -    my_bool trans_non_trans_access_engines= FALSE;
> +    my_bool trans_read_engine= FALSE;
>      /*
> -       If all engines that are about to be updated are
> -       transactional.
> +       If a transactional is about to be updated.
>      */
> -    my_bool all_trans_write_engines= TRUE;
> +    my_bool trans_write_engine= FALSE;
> +    /*
> +       If a non-transactional is about to be read. Note that
> +       a write implies a read.
> +    */
> +    my_bool non_trans_read_engine= FALSE;
> +    /*
> +       If a non-transactional is about to be updated.
> +    */
> +    my_bool non_trans_write_engine= FALSE;
> +
>      TABLE* prev_write_table= NULL;
>      TABLE* prev_access_table= NULL;
>  
> @@ -3712,9 +3720,12 @@ int THD::decide_logging_format(TABLE_LIS
>      {
>        if (table->placeholder())
>          continue;
> +
>        if (table->table->s->table_category == TABLE_CATEGORY_PERFORMANCE)
>          lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_SYSTEM_TABLE);
> +
>        handler::Table_flags const flags=
> table->table->file->ha_table_flags();
> +
>        DBUG_PRINT("info", ("table: %s; ha_table_flags: 0x%llx",
>                            table->table_name, flags));
>        if (table->lock_type >= TL_WRITE_ALLOW_WRITE)
> @@ -3723,13 +3734,13 @@ int THD::decide_logging_format(TABLE_LIS
>              table->table->file->ht)
>            multi_write_engine= TRUE;
>          /*
> -          Every temporary table must be always written to the binary
> -          log in transaction boundaries and as such we artificially
> -          classify them as transactional.
> +          If there is an on-going transaction and a transactional table
> +          was already updated, a temporary table must be written to the
> +          binary log in the boundaries of the on-going transaction and
> +          as such we artificially classify them as transactional.
>  
>            Indirectly, this avoids classifying a temporary table created
> -          on a non-transactional engine as unsafe when it is modified
> -          after any transactional table:
> +          on a non-transactional table as unsafe.
>  
>            BEGIN;
>              INSERT INTO innodb_t VALUES (1);
> @@ -3743,156 +3754,117 @@ int THD::decide_logging_format(TABLE_LIS
>              INSERT INTO myisam_t_temp VALUES (1);
>            COMMIT;
>          */
> -        all_trans_write_engines= all_trans_write_engines &&
> -                                 (table->table->file->has_transactions()
> ||
> -                                  table->table->s->tmp_table);
> -        prev_write_table= table->table;
> -        flags_write_all_set &= flags;
> -        flags_write_some_set |= flags;
> -      }
> -      flags_some_set |= flags;
> -      /*
> -        The mixture of non-transactional and transactional tables must
> -        identified and classified as unsafe. However, a temporary table
> -        must be always handled as a transactional table. Based on that,
> -        we have the following statements classified as mixed and by
> -        consequence as unsafe:
> -
> -        1: INSERT INTO myisam_t SELECT * FROM innodb_t;
> -
> -        2: INSERT INTO innodb_t SELECT * FROM myisam_t;
> +        my_bool trans= (table->table->file->has_transactions() ||
> +                        (table->table->s->tmp_table &&
> +                         trans_has_updated_trans_table(this)));
>  
> -        3: INSERT INTO myisam_t SELECT * FROM myisam_t_temp;
> +        trans_write_engine= trans_write_engine || trans;
> +        non_trans_write_engine= non_trans_write_engine || !trans;
>  
> -        4: INSERT INTO myisam_t_temp SELECT * FROM myisam_t;
> -
> -        5: CREATE TEMPORARY TABLE myisam_t_temp SELECT * FROM mysiam_t;
> -
> -        The following statements are not considered mixed and as such
> -        are safe:
> +        flags_write_all_set &= flags;
> +        flags_write_some_set |= flags;
>  
> -        1: INSERT INTO innodb_t SELECT * FROM myisam_t_temp;
> +        prev_write_table= table->table;
> +      }
> +      flags_access_some_set |= flags;
>  
> -        2: INSERT INTO myisam_t_temp SELECT * FROM innodb_t_temp;
> -      */
> -      if (!trans_non_trans_access_engines && prev_access_table &&
> -          (lex->sql_command != SQLCOM_CREATE_TABLE ||
> +      if (lex->sql_command != SQLCOM_CREATE_TABLE ||
>            (lex->sql_command == SQLCOM_CREATE_TABLE &&
> -          (lex->create_info.options & HA_LEX_CREATE_TMP_TABLE))))
> +          (lex->create_info.options & HA_LEX_CREATE_TMP_TABLE)))
>        {
> -        my_bool prev_trans;
> -        my_bool act_trans;
> -        if (prev_access_table->s->tmp_table ||
> table->table->s->tmp_table)
> -        {
> -          prev_trans= prev_access_table->s->tmp_table ? TRUE :
> -                     prev_access_table->file->has_transactions();
> -          act_trans= table->table->s->tmp_table ? TRUE :
> -                    table->table->file->has_transactions();
> -        }
> -        else
> -        {
> -          prev_trans= prev_access_table->file->has_transactions();
> -          act_trans= table->table->file->has_transactions();
> -        }
> -        trans_non_trans_access_engines= (prev_trans != act_trans);
> -        multi_access_engine= TRUE;
> +        my_bool trans= (table->table->file->has_transactions() ||
> +                        (table->table->s->tmp_table &&
> +                        trans_has_updated_trans_table(this)));
> +
> +        trans_read_engine= trans_read_engine || trans;
> +        non_trans_read_engine= non_trans_read_engine || !trans;
>        }
> -      thread_temporary_used |= table->table->s->tmp_table;
> +
> +      if (prev_access_table && prev_access_table->file->ht !=
> +          table->table->file->ht)
> +        multi_access_engine= TRUE;
> +
> +      thread_temporary_used |= (trans_has_updated_trans_table(this) &&
> +                               table->table->s->tmp_table);
>        prev_access_table= table->table;
>      }
>  
>      DBUG_PRINT("info", ("flags_write_all_set: 0x%llx", flags_write_all_set));
>      DBUG_PRINT("info", ("flags_write_some_set: 0x%llx", flags_write_some_set));
> -    DBUG_PRINT("info", ("flags_some_set: 0x%llx", flags_some_set));
> +    DBUG_PRINT("info", ("flags_access_some_set: 0x%llx", flags_access_some_set));
>      DBUG_PRINT("info", ("multi_write_engine: %d", multi_write_engine));
>      DBUG_PRINT("info", ("multi_access_engine: %d", multi_access_engine));
> -    DBUG_PRINT("info", ("trans_non_trans_access_engines: %d",
> -                        trans_non_trans_access_engines));
>  
>      int error= 0;
>      int unsafe_flags;
>  
>      /*
> -      Set the statement as unsafe if:
> -
> -      . it is a mixed statement, i.e. access transactional and non-transactional
> -      tables, and update any of them;
> -
> -      or:
> -
> -      . an early statement updated a transactional table;
> -      . and, the current statement updates a non-transactional table.
> -
> -      Any mixed statement is classified as unsafe to ensure that mixed mode is
> -      completely safe. Consider the following example to understand why we
> -      decided to do this:
> -
> -      Note that mixed statements such as
> -
> -      1: INSERT INTO myisam_t SELECT * FROM innodb_t;
> -
> -      2: INSERT INTO innodb_t SELECT * FROM myisam_t;
> -
> -      3: INSERT INTO myisam_t SELECT * FROM myisam_t_temp;
> -
> -      4: INSERT INTO myisam_t_temp SELECT * FROM myisam_t;
> -
> -      5: CREATE TEMPORARY TABLE myisam_t_temp SELECT * FROM mysiam_t;
> -
> -      are classified as unsafe to ensure that in mixed mode the execution is
> -      completely safe and equivalent to the row mode. Consider the following
> -      statements and sessions (connections) to understand the reason:
> -
> -      con1: INSERT INTO innodb_t VALUES (1);
> -      con1: INSERT INTO innodb_t VALUES (100);
> +      Classify a statement as unsafe when there is an on-going transaction if:
>  
> -      con1: BEGIN
> -      con2: INSERT INTO myisam_t SELECT * FROM innodb_t;
> -      con1: INSERT INTO innodb_t VALUES (200);
> -      con1: COMMIT;
> -
> -      The point is that the concurrent statements may be written into the binary
> log
> -      in a way different from the execution. For example,
> -
> -      BINARY LOG:
> -
> -      con2: BEGIN;
> -      con2: INSERT INTO myisam_t SELECT * FROM innodb_t;
> -      con2: COMMIT;
> -      con1: BEGIN
> -      con1: INSERT INTO innodb_t VALUES (200);
> -      con1: COMMIT;
> -
> -      ....
> -
> -      or
> -
> -      BINARY LOG:
> +        1. it is a mixed statement, i.e. access transactional and non-transactional
> +        tables, that is about to update both types of tables.
> +      
> +        2. it is a mixed statement that is about to update the transactional table
> +        and read from the non-transactional table.
> +
> +        3. it is a mixed statement that is about to update the non-transactional
> +        table and read from the transactional table when the isolation level is
> +        lower than serializability.
> +
> +      Or when there is an on-going transaction and a transactional table was
> +      already updated if:
> +
> +        4. it is a mixed statement that is about to update the non-transactional
> +        table and read from the transactional table.
> +
> +        5. it is a statement that is about to update a non-transactional table and
> +        the option variables.binlog_direct_non_trans_update is OFF.
> +
> +      The reason for this is that locks acquired may not protected a concurrent
> +      transaction of interfering in the current execution and by consequence in
> +      the result.
> +    */
>  
> -      con1: BEGIN
> -      con1: INSERT INTO innodb_t VALUES (200);
> -      con1: COMMIT;
> -      con2: BEGIN;
> -      con2: INSERT INTO myisam_t SELECT * FROM innodb_t;
> -      con2: COMMIT;
> +    if (in_multi_stmt_transaction_mode())
> +    {
> +      my_bool mixed_unsafe= FALSE;
> +      my_bool non_trans_unsafe= FALSE;
>  
> -      Clearly, this may become a problem in STMT mode and setting the statement
> -      as unsafe will make rows to be written into the binary log in MIXED mode
> -      and as such the problem will not stand.

This should be case #1.

> +      if (trans_write_engine && non_trans_write_engine)
> +        mixed_unsafe= TRUE;

This should be case #2.

> +      else if (trans_write_engine && non_trans_read_engine)
> +        mixed_unsafe= TRUE;

This should be case #3.

> +      else if (non_trans_write_engine && trans_read_engine &&
> +               tx_isolation < ISO_SERIALIZABLE)
> +        /*
> +           By default, InnoDB operates in REPEATABLE READ and with the option
> +           locks_unsafe_for_binlog disabled. In this case, InnoDB uses next-key
> +           locks for searches and index scans, which prevents phantom rows.
> +           
> +           This is equivalent to the SERIALIZABLE isolation level.
> +
> +           Unfortunately, there are no means to transparently obtain this
> +           information for an engine. For that reason, we assume SERIALIZABILITY
> +           as the minimum isolation level here thus generating false positives
> +           for Innodb. 
> +        */
> +        mixed_unsafe= TRUE;
>  
> -      In STMT mode, although such statement is classified as unsafe, i.e.

This should be case #4.

> +      if (trans_has_updated_trans_table(this))
> +      {
> +        if (non_trans_write_engine && trans_read_engine)
> +          mixed_unsafe= TRUE;

Finally, case #5.


It's pretty clear, however, I would just reference the cases
inside some comments. Meh... keep it like it's now or make it
like Sven did down below in decide_logging_format.

> +        else if (!variables.binlog_direct_non_trans_update &&
> +                 non_trans_write_engine)
> +          non_trans_unsafe= TRUE;
> +      }
>  
> -      INSERT INTO myisam_t SELECT * FROM innodb_t;
> +      if (mixed_unsafe)
> +        lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_MIXED_STATEMENT);
> +      else if (non_trans_unsafe)
> +        lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_NONTRANS_AFTER_TRANS);
> +    }
>  
> -      there is no enough information to avoid writing it outside the boundaries
> -      of a transaction. This is not a problem if we are considering snapshot
> -      isolation level but if we have pure repeatable read or serializable the
> -      lock history on the slave will be different from the master.
> -    */
> -    if (trans_non_trans_access_engines)
> -      lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_MIXED_STATEMENT);
> -    else if (trans_has_updated_trans_table(this) &&
> !all_trans_write_engines)
> -      lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_NONTRANS_AFTER_TRANS);
>  
>      /*
>        If more than one engine is involved in the statement and at
> @@ -3904,7 +3876,7 @@ int THD::decide_logging_format(TABLE_LIS
>          (flags_write_some_set & HA_HAS_OWN_BINLOGGING))
>        my_error((error= ER_BINLOG_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE),
>                 MYF(0));
> -    else if (multi_access_engine && flags_some_set &
> HA_HAS_OWN_BINLOGGING)
> +    else if (multi_access_engine && flags_access_some_set &
> HA_HAS_OWN_BINLOGGING)
>       
> lex->set_stmt_unsafe(LEX::BINLOG_STMT_UNSAFE_MULTIPLE_ENGINES_AND_SELF_LOGGING_ENGINE);
>  
>      /* both statement-only and row-only engines involved */
> 
> 
> 
> 
> 

Thread
Fwd: Re: bzr commit into mysql-trunk-bugfixing branch(alfranio.correia:3073) Bug#53259Luís Soares24 Jun