BUG#53452 Inconsistent behavior of binlog_direct_non_transactional_updates with

temp table
            
This patch introduces two key changes in the replication's behavior.
            
Firstly, it reverts part of BUG#51894 which puts any update to temporary tables
into the trx-cache. Now, updates to temporary tables are handled according to
the type of their engines as a regular table.
            
Secondly, an unsafe mixed statement, (i.e. a statement that access transactional
table as well non-transactional or temporary table, and writes to any of them),
are written into the trx-cache in order to minimize errors in the execution when
the statement logging format is in use.
            
Such changes has a direct impact on which statements are classified as unsafe
statements and thus part of BUG#53259 is reverted.

3 files changed, 12 insertions, 12 deletions

diff --git a/mysql-test/suite/perfschema/r/binlog_mix.result b/mysql-test/suite/perfschema/r/binlog_mix.result
index b437f4eda1f..1e58179af51 100644
--- a/mysql-test/suite/perfschema/r/binlog_mix.result
+++ b/mysql-test/suite/perfschema/r/binlog_mix.result
@@ -28,8 +28,8 @@ master-bin.000001	#	Table_map	#	#	table_id: # (performance_schema.SETUP_INSTRUME
 master-bin.000001	#	Update_rows	#	#	table_id: #
 master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `test`; drop table if exists test.t1
-master-bin.000001	#	Query	#	#	use `test`; drop table if exists test.t2
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; create table test.t1 (thread_id integer)
 master-bin.000001	#	Query	#	#	use `test`; create table test.t2 (name varchar(128))
 master-bin.000001	#	Query	#	#	BEGIN
@@ -40,8 +40,8 @@ master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `test`; drop table test.t1
-master-bin.000001	#	Query	#	#	use `test`; drop table test.t2
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t2` /* generated by server */
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (performance_schema.SETUP_INSTRUMENTS)
 master-bin.000001	#	Update_rows	#	#	table_id: #
diff --git a/mysql-test/suite/perfschema/r/binlog_row.result b/mysql-test/suite/perfschema/r/binlog_row.result
index 50a201a81d9..28803c73a84 100644
--- a/mysql-test/suite/perfschema/r/binlog_row.result
+++ b/mysql-test/suite/perfschema/r/binlog_row.result
@@ -28,8 +28,8 @@ master-bin.000001	#	Table_map	#	#	table_id: # (performance_schema.SETUP_INSTRUME
 master-bin.000001	#	Update_rows	#	#	table_id: #
 master-bin.000001	#	Update_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `test`; drop table if exists test.t1
-master-bin.000001	#	Query	#	#	use `test`; drop table if exists test.t2
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; create table test.t1 (thread_id integer)
 master-bin.000001	#	Query	#	#	use `test`; create table test.t2 (name varchar(128))
 master-bin.000001	#	Query	#	#	BEGIN
@@ -40,8 +40,8 @@ master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.t2)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `test`; drop table test.t1
-master-bin.000001	#	Query	#	#	use `test`; drop table test.t2
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t2` /* generated by server */
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (performance_schema.SETUP_INSTRUMENTS)
 master-bin.000001	#	Update_rows	#	#	table_id: #
diff --git a/mysql-test/suite/perfschema/r/binlog_stmt.result b/mysql-test/suite/perfschema/r/binlog_stmt.result
index 531559763bc..288eba4d3d6 100644
--- a/mysql-test/suite/perfschema/r/binlog_stmt.result
+++ b/mysql-test/suite/perfschema/r/binlog_stmt.result
@@ -36,8 +36,8 @@ master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; update performance_schema.SETUP_INSTRUMENTS set enabled='NO'
   where name like "wait/synch/rwlock/%"
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `test`; drop table if exists test.t1
-master-bin.000001	#	Query	#	#	use `test`; drop table if exists test.t2
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t1` /* generated by server */
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE IF EXISTS `t2` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; create table test.t1 (thread_id integer)
 master-bin.000001	#	Query	#	#	use `test`; create table test.t2 (name varchar(128))
 master-bin.000001	#	Query	#	#	BEGIN
@@ -49,8 +49,8 @@ master-bin.000001	#	Query	#	#	use `test`; insert into test.t2
 select name from performance_schema.SETUP_INSTRUMENTS
 where name like "wait/synch/rwlock/%"
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `test`; drop table test.t1
-master-bin.000001	#	Query	#	#	use `test`; drop table test.t2
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
+master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t2` /* generated by server */
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; update performance_schema.SETUP_INSTRUMENTS set enabled='YES'
   where name like "wait/synch/rwlock/%"