Merge lp:~gl-az/percona-server/ST-41544-5.5 into lp:percona-server/5.5

[George Ormond Lorch III]

bug 1313901 : When a session creates a temporary table and that table is used
within queries, the binlog format of the session is unconditionally switched to
ROW for the remainder of the session or until all temporary tables have been
dropped.

This is a result of an old fix for upstream 20499.

The consequence this has on the slave is that, the slave is single threaded and
executes all queries from a single session. If the slave is also binlogging, the
slave will unconditionally binlog every statement it receives in ROW format
until all temp tables are dropped. This means statements get logged in different
format on the master and the slave and can introduce huge slave lag.

Through discussion with our varous experts, we decided to undo the original
20499 fix and change the fundamental way MIXED replication works with regard to
temp tables. The new MIXED replication behavior can be summed up as follows:

If using MIXED mode replication, all DDL and DML statements that touch a
temporary table will be marked to binlog in ROW format. This means that any
statement that is using exclusively temporary tables will not be binlogged at
all. Any DDL or DML that uses a mix of temporary and non-temporary tables will
be binlogged in ROW format for the non-temporary table operations. The one
exception is DROP table when dropping a temporary table which will always be
binlogged as DROP TEMPORARY TABLE IF EXISTS on the master.

The code changes to make this happen are very minor but have a huge impact.
Many test cases in the rpl and binlog suite need to be changes and some
eliminated entirely as they test for functionality that no longer exists.

During the testing of this feature, each and every mtr test failure was closely
scruitinized to ensure that the failure was a legitimate and expected change
in behavior. This caused a lot of back-and-forth debugging and fixing to ensure
that the resulting server behavior and mtr test cases were 100% as described in
the new behavior above.

[George Ormond Lorch III (gl-az)]

Jenkins http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/1014/

[Laurynas Biveinis (laurynas-biveinis)]

    - For setting creating_temp_table to TRUE, add
      !create_drop_temp_table as the first condition to the if
      statement.

    - the header comment in the tests that include
      extra/rpl_tests/rpl_drop_temp.test and was moved there and should be
      removed from the tests themselves.

    - extra/binlog_tests/drop_temp_table.test the header comment for
      bug #46572 is now outdated for MBR.

    - Is this bit really correct? (and the rest of binlog_stm_binlog)
      We shouldn't be affecting SBR replication of temp tables, should
      we?

--- mysql-test/suite/binlog/r/binlog_stm_binlog.result 2011-02-23 11:54:58 +0000
+++ mysql-test/suite/binlog/r/binlog_stm_binlog.result 2014-06-19 20:16:48 +0000
@@ -635,9 +635,7 @@
 COERCIBILITY(s1) d3;
 DROP TEMPORARY TABLE tmp1;
 END
-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` /* generated by server */
+master-bin.000001 # Query # # DROP TEMPORARY TABLE IF EXISTS `bug39182`.`tmp1` /* generated by server */
 DROP PROCEDURE p1;
 DROP TABLE t1;
 DROP DATABASE bug39182;

    - Would it be a good idea to record RBR/MBR version(s) of
      binlog_tmp_table.test?

    - rpl_row_reset_slave and rpl_mix_reset_slave result files are
      identical. Let's join the testcases?

    - rpl_stop_slave tests more than temp table replication. Possible
      to restore it for MBR?

review: Needs Fixing

[George Ormond Lorch III (gl-az)]

OK, it's been a bit since I updated this so I wanted to give a quick status update on it...

> - For setting creating_temp_table to TRUE, add
> !create_drop_temp_table as the first condition to the if
> statement.

You have a typo here, at first I couldn't figure out what you were suggesting but I finally saw it. Since that 'if' statement is executed within the loop iterating all tables in the query, and the 'if' statement does find_temporary_table on each table, it can be a bit of a performance ding if there are a lot of temp tables. This is a nice little precheck to see if we need to do all of the different tests and find if we have already determined that the query is doing a CREATE TEMP or a DROP on a TEMP.

>
> - the header comment in the tests that include
> extra/rpl_tests/rpl_drop_temp.test and was moved there and should be
> removed from the tests themselves.
>
> - extra/binlog_tests/drop_temp_table.test the header comment for
> bug #46572 is now outdated for MBR.

Yeah, good eye, got these easily fixed.

>
> - Is this bit really correct? (and the rest of binlog_stm_binlog)
> We shouldn't be affecting SBR replication of temp tables, should
> we?
>
> --- mysql-test/suite/binlog/r/binlog_stm_binlog.result 2011-02-23 11:54:58
> +0000
> +++ mysql-test/suite/binlog/r/binlog_stm_binlog.result 2014-06-19 20:16:48
> +0000
> @@ -635,9 +635,7 @@
> COERCIBILITY(s1) d3;
> DROP TEMPORARY TABLE tmp1;
> END
> -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` /* generated by server */
> +master-bin.000001 # Query # # DROP TEMPORARY TABLE
> IF EXISTS `bug39182`.`tmp1` /* generated by server */
> DROP PROCEDURE p1;
> DROP TABLE t1;
> DROP DATABASE bug39182;

Still looking into this one but IIRC from the earlier work on this we are setting the statement as ROW but that then doesn't block it from the binlog, it transforms it into a DROP TABLE IF EXISTS instead. Since this test is for STMT only, I don't quite know why this has changed. It may be a valid side effect of the changes to avoid a lot more coding around the issue or it may be a bug in the fix. Need to investigate this deeper to figure out what the right answer is.

>
> - Would it be a good idea to record RBR/MBR version(s) of
> binlog_tmp_table.test?

Why yes it would, a very good idea, and in fact, it found a bug. TRUNCATE TABLE on a temp table is still getting binlogged as STMT in mixed mode...working on a somewhat simple fix here.

>
> - rpl_row_reset_slave and rpl_mix_reset_slave result files are
> identical. Let's join the testcases?

Sure, done, changed existing rpl_row_reset_slave.test to do both row and mixed, reverted file adds and changes to rpl_stm_reset_slave.test, then removed mixed from the stm test.

>
> - rpl_stop_slave tests more than temp table replication. Possible
> to restore it for MBR?
...

[Laurynas Biveinis (laurynas-biveinis)]

> > - rpl_stop_slave tests more than temp table replication. Possible
> > to restore it for MBR?
>
> Not easily, the test is really designed for STMT only as it does diff_tables
> between the master and slave, mostly on temp tables. Since this change makes
> temp tables operate more like ROW when doing MIXED it means we would almost
> have to rewrite a new stop_slave test for MBR that just skipped anything
> related to temp tables in order to test the non-temp bits. If you think we
> should go that far then yeah, I can do that.

Are you referring to "bug 56118" part of rpl_stop_slave? There is "bug 58546" part too, which does not seem to be related to temp tables. Maybe split the testcase then?

[George Ormond Lorch III (gl-az)]

On 10/12/2014 01:49 AM, Laurynas Biveinis wrote:
>>> - rpl_stop_slave tests more than temp table replication. Possible
>>> to restore it for MBR?
>> Not easily, the test is really designed for STMT only as it does diff_tables
>> between the master and slave, mostly on temp tables. Since this change makes
>> temp tables operate more like ROW when doing MIXED it means we would almost
>> have to rewrite a new stop_slave test for MBR that just skipped anything
>> related to temp tables in order to test the non-temp bits. If you think we
>> should go that far then yeah, I can do that.
> Are you referring to "bug 56118" part of rpl_stop_slave? There is "bug 58546" part too, which does not seem to be related to temp tables. Maybe split the testcase then?
Yes, the 56118 is now pretty specific to SBR and temp tables. I will
split 58546 out to a unique test case that does both SBR and MBR.

--
George O. Lorch III
Software Engineer, Percona
[phone] x542 US/Arizona (GMT -7)
skype: george.ormond.lorch.iii

[George Ormond Lorch III (gl-az)]

On 07/05/2014 05:45 AM, Laurynas Biveinis wrote:
> - Is this bit really correct? (and the rest of binlog_stm_binlog)
> We shouldn't be affecting SBR replication of temp tables, should
> we?
>
> --- mysql-test/suite/binlog/r/binlog_stm_binlog.result 2011-02-23 11:54:58 +0000
> +++ mysql-test/suite/binlog/r/binlog_stm_binlog.result 2014-06-19 20:16:48 +0000
> @@ -635,9 +635,7 @@
> COERCIBILITY(s1) d3;
> DROP TEMPORARY TABLE tmp1;
> END
> -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` /* generated by server */
> +master-bin.000001 # Query # # DROP TEMPORARY TABLE IF EXISTS `bug39182`.`tmp1` /* generated by server */
> DROP PROCEDURE p1;
> DROP TABLE t1;
> DROP DATABASE bug39182;
>
OK, yes, this is correct. I didn't catch it before but the issue is that
the test case name implies SBR, but in fact it is specifically testing
MBR instead, thus these result changes are correct. I suppose that could
be a bug in itself that the test is binlog_stm_binlog.test. I think it
would probably be a good idea to add/record a binlog_mix_binlog.test and
fix the _stm_ to actualy test SBR.

--
George O. Lorch III
Software Engineer, Percona
[phone] x542 US/Arizona (GMT -7)
skype: george.ormond.lorch.iii

[George Ormond Lorch III (gl-az)]

OK, so I think I have everything addressed and a new push to the branch.

Here is a new jenkins run: http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/1059/

There are a few test failures, most of which are pre-existing. Two in particular that show up in replication are:
rpl.rpl_filter_tables_not_exist 'stmt' - Only happened on one slave. This does not _appear_ to be a pre-existing issue and I can not reproduce it locally. I reviewed the test case and there doesn't look like there is any place where this test would interact with my changes, but if you could please take a close look at it.
rpl.rpl_row_until 'row' - This is a pre-existing issue and I can sporadically reproduce it locally on revno 670 (before this fix).

[Laurynas Biveinis (laurynas-biveinis)]

    - Please rebase on the current 5.5 to 5.6 GCA. It will include at
      least one more upstream merge, which always touches replication
      and its testsuite. Perhaps that will resolve the rpl_stop_slave
      conflicts too.

    - suite/rpl/t/rpl_drop_temp.test should be bzr mv'ed to
      extra/rpl_tests/rpl_drop_temp.test and
      suite/rpl/t/rpl_stm_drop_temp.test should bzr add'ed. This will
      give a smaller diff, and the upstream merges will cause
      conflicts or automerge at the right place.

    - Likewise for rpl_rewrt_db.

    - In rpl_mixed_drop_create_temp_table, diff lines 1792+ ("B N
      N-Temp T-SELECT-N-Temp N-Temp C"), it seems that binlog is
      missing the row events for INSERT INTO nt_xx_1 SELECT * FROM
      tt_tmp_xx_1;

    - Add a comment to the end of rpl_stop_slave "bug 58546 part was
      moved to ... " to help with future merges.

    - There is a couple of diff comments.

review: Needs Fixing

[George Ormond Lorch III (gl-az)]

> - Please rebase on the current 5.5 to 5.6 GCA. It will include at
> least one more upstream merge, which always touches replication
> and its testsuite. Perhaps that will resolve the rpl_stop_slave
> conflicts too.

Sorry about that, I did rebase what seem like not too long ago but must have just missed the 5.5.39-36.0 merge.

I am beginning to have a concern over the long term maintenance of this fix. This is the 3rd or 4th time I have rebased and each time I have had to fixup mtr tests to work correctly with this fix :-\

[George Ormond Lorch III (gl-az)]

> - In rpl_mixed_drop_create_temp_table, diff lines 1792+ ("B N
> N-Temp T-SELECT-N-Temp N-Temp C"), it seems that binlog is
> missing the row events for INSERT INTO nt_xx_1 SELECT * FROM
> tt_tmp_xx_1;

Are you sure about this, that you are looking at the same test correctly? Diff line 1792+ isn't:
'B N N-Temp T-SELECT-N-Temp N-Temp C'
it is:
'B N N-Temp N-SELECT-T-Temp N-Temp C'

This test and the results seem fine...Here is the portion of the result file for 'B N N-Temp T-SELECT-N-Temp N-Temp C':

SET @commands= 'B N N-Temp T-SELECT-N-Temp N-Temp C';
BEGIN;
INSERT INTO nt_xx_1() VALUES (1);
INSERT INTO nt_tmp_xx_1() VALUES (1);
INSERT INTO tt_xx_1 SELECT * FROM nt_tmp_xx_1;
INSERT INTO nt_tmp_xx_1() VALUES (1);
COMMIT;
-b-b-b-b-b-b-b-b-b-b-b- >> B N N-Temp T-SELECT-N-Temp N-Temp 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 # Query # # use `test`; INSERT INTO nt_xx_1() VALUES (1)
master-bin.000001 # Query # # COMMIT
master-bin.000001 # Query # # BEGIN
master-bin.000001 # Table_map # # table_id: # (test.tt_xx_1)
master-bin.000001 # Write_rows # # table_id: # flags: STMT_END_F
master-bin.000001 # Xid # # COMMIT /* XID */
-e-e-e-e-e-e-e-e-e-e-e- >> B N N-Temp T-SELECT-N-Temp N-Temp C << -e-e-e-e-e-e-e-e-e-e-e-

The only things that should be binlogged here is the 'INSERT INTO nt_xx_1' as STMT, then the 'INSERT INTO tt_xx_1 SELECT' as ROW and that seems to be happening correctly right?

Maybe you are looking at the following case 'B N N-Temp N-SELECT-T-Temp N-Temp C', this is file as well, here is the snippet from the result file:

SET @commands= 'B N N-Temp N-SELECT-T-Temp N-Temp C';
BEGIN;
INSERT INTO nt_xx_1() VALUES (1);
INSERT INTO nt_tmp_xx_1() VALUES (1);
INSERT INTO nt_xx_1 SELECT * FROM tt_tmp_xx_1;
INSERT INTO nt_tmp_xx_1() VALUES (1);
COMMIT;
-b-b-b-b-b-b-b-b-b-b-b- >> B N N-Temp N-SELECT-T-Temp N-Temp 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 # Query # # use `test`; INSERT INTO nt_xx_1() VALUES (1)
master-bin.000001 # Query # # COMMIT
-e-e-e-e-e-e-e-e-e-e-e- >> B N N-Temp N-SELECT-T-Temp N-Temp C << -e-e-e-e-e-e-e-e-e-e-e-

At first this looked wrong, like it was missing row events for the third insert 'INSERT INTO nt_xx_1 SELECT * FROM tt_tmp_xx_1;', which it is, because there are no rows in tt_tmp_xx_1 at this point in the test, it seems that it is an empty temp table that never gets anything inserted the entire test. So this case seems right to me as well.

[George Ormond Lorch III (gl-az)]

Addressed issues noted except for the 'missing row' as mentioned in previous comment. New jenkins run: http://jenkins.percona.com/view/PS%205.5/job/percona-server-5.5-param/1062/

[Laurynas Biveinis (laurynas-biveinis)]

    - This now looks good, thanks for explaining the
      rpl_mixed_drop_create_temp_table bits. But there are a couple of
      bzr bits that need addressing. As for the patch maintenance, it
      looks like the hard part is already behind us, at least until
      upstream fixes the same.

    - Please recommit with --file option instead of -m ;)

    - The old rpl_drop_temp.result should be bzr mv'ed to
      rpl_stm_drop_temp.result? Likewise rpl_rewrt_db.result to
      rpl_stm_rewrt_db.result? While at that, the small -slave.opt
      files too? All this would help with bzr merges.

review: Needs Fixing

[George Ormond Lorch III (gl-az)]

> - Please recommit with --file option instead of -m ;)
/facepalm

>
> - The old rpl_drop_temp.result should be bzr mv'ed to
> rpl_stm_drop_temp.result? Likewise rpl_rewrt_db.result to
> rpl_stm_rewrt_db.result? While at that, the small -slave.opt
> files too? All this would help with bzr merges.

Done, I wasn't sure which way was going to be best, mv or add, had a 50/50 shot at guessing :)

And another jenkins run for good measure:

http://jenkins.percona.com/job/percona-server-5.5-param/1063/

[Laurynas Biveinis (laurynas-biveinis)]

Looks good. Will be merged once the 5.6 MP is ready.

review: Approve

=== modified file 'mysql-test/extra/binlog_tests/drop_temp_table.test'
--- mysql-test/extra/binlog_tests/drop_temp_table.test	2010-06-29 10:54:58 +0000
+++ mysql-test/extra/binlog_tests/drop_temp_table.test	2014-10-22 21:45:42 +0000
@@ -20,6 +20,7 @@
 # In RBR, 'DROP TEMPORARY TABLE ...' statement should never be binlogged no
 # matter if the tables exist or not. In contrast, both in SBR and MBR, the
 # statement should be always binlogged no matter if the tables exist or not.
+# In MBR though, it will always be binlogged with IF EXISTS.
 ##############################################################################
 CREATE TEMPORARY TABLE tmp(c1 int);
 CREATE TEMPORARY TABLE tmp1(c1 int);

=== renamed file 'mysql-test/suite/binlog/t/binlog_tmp_table.test' => 'mysql-test/extra/binlog_tests/tmp_table.test'
--- mysql-test/suite/binlog/t/binlog_tmp_table.test	2010-04-28 12:47:49 +0000
+++ mysql-test/extra/binlog_tests/tmp_table.test	2014-10-22 21:45:42 +0000
@@ -26,7 +26,6 @@
 # BUG#35583 mysqlbinlog replay fails with ERROR 1146 when temp tables are used
 #
 source include/have_log_bin.inc;
-source include/have_binlog_format_mixed_or_statement.inc;
 
 RESET MASTER;
 

=== renamed file 'mysql-test/suite/rpl/t/rpl_drop_temp.test' => 'mysql-test/extra/rpl_tests/rpl_drop_temp.test'
--- mysql-test/suite/rpl/t/rpl_drop_temp.test	2010-12-19 17:15:12 +0000
+++ mysql-test/extra/rpl_tests/rpl_drop_temp.test	2014-10-22 21:45:42 +0000
@@ -5,9 +5,6 @@
 # Purpose: According to TU in 16552 This is how
 # to work around NDB's issue with temp tables
 ##############################################
-source include/master-slave.inc;
-source include/have_binlog_format_mixed_or_statement.inc;
-
 --disable_warnings
 create database if not exists mysqltest;
 --enable_warnings
@@ -94,4 +91,3 @@
 DROP TABLE t1;
 
 # End of 4.1 tests
---source include/rpl_end.inc

=== modified file 'mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test'
--- mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test	2010-12-19 17:15:12 +0000
+++ mysql-test/extra/rpl_tests/rpl_implicit_commit_binlog.test	2014-10-22 21:45:42 +0000
@@ -357,7 +357,7 @@
   {
     let $cmd= CREATE TEMPORARY TABLE tt_xx (a int);
     let $in_temporary= yes;
-    # In SBR and MIXED modes, the DDL statement is written to the binary log but
+    # In SBR mode, the DDL statement is written to the binary log but
     # does not commit the current transaction.
     #
     # 1: BEGIN
@@ -373,10 +373,21 @@
     # 3: ROW EVENT
     # 4: COMMIT
     #
-    if (`select @@binlog_format = 'STATEMENT' || @@binlog_format = 'MIXED'` )
+    # In MIXED mode, the DDL statement is not written to the binary log and
+    # does not commit the current transaction.
+    #
+    # 1: BEGIN
+    # 2: INSERT
+    # 3: COMMIT
+    #
+    if (`select @@binlog_format = 'STATEMENT'` )
     {
       let $commit_event_row_number= 4;
     }
+    if (`select @@binlog_format = 'MIXED'` )
+    {
+      let $commit_event_row_number= 3;
+    }
     #
     # In NDB (RBR mode), the commit event is the sixth event
     # in the binary log:
@@ -418,14 +429,15 @@
     # In MIXED mode, the changes are logged as rows and we have what follows:
     #
     # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: ROW EVENT
-    # 4: COMMIT
-    # 5: DDL EVENT which triggered the previous commmit.
+    # 2: ROW EVENT
+    # 3: COMMIT
     #
     if (`select @@binlog_format = 'MIXED'`)
     {
-      let $commit_event_row_number= 4;
+      # Since this alter is done on a temp table in MIXED, it will not be
+      # binlogged at all, so explicitly commit.
+      let $in_temporary= yes;
+      let $commit_event_row_number= 3;
     }
     #
     # In NDB (RBR and MIXED modes), the commit event is the sixth event
@@ -450,14 +462,15 @@
     # In MIXED mode, the changes are logged as rows and we have what follows:
     #
     # 1: BEGIN
-    # 2: TABLE MAP EVENT
-    # 3: ROW EVENT
-    # 4: COMMIT
-    # 5: DDL EVENT which triggered the previous commmit.
+    # 2: ROW EVENT
+    # 3: COMMIT
     #
     if (`select @@binlog_format = 'MIXED'`)
-    {
-      let $commit_event_row_number= 4;
+    { 
+      # Since this alter is done on a temp table in MIXED, it will not be
+      # binlogged at all, so explicitly commit.
+      let $in_temporary= yes;
+      let $commit_event_row_number= 3;
     }
     #
     # In NDB (RBR and MIXED modes), the commit event is the sixth event
@@ -502,7 +515,7 @@
     {
       let $commit_event_row_number= 4;
     }
-    # In MIXED mode, the changes are logged as rows and we have what follows:
+    # In ROW mode, the changes are logged as rows and we have what follows:
     #
     # 1: BEGIN
     # 2: TABLE MAP EVENT
@@ -510,10 +523,22 @@
     # 4: DROP TEMPORARY table IF EXISTS
     # 5: COMMIT
     #
-    if (`select @@binlog_format = 'MIXED' || @@binlog_format = 'ROW'`)
+    if (`select @@binlog_format = 'ROW'`)
     {
       let $commit_event_row_number= 5;
     }
+    # In MIXED mode, the changes are logged as rows and we have what follows:
+    #
+    # 1: BEGIN
+    # 2: ROW EVENT
+    # 3: DROP TEMPORARY table IF EXISTS
+    # 4: COMMIT
+    #
+    if (`select @@binlog_format = 'MIXED'`)
+    {
+      let $commit_event_row_number= 4;
+    }
+
     #
     # In NDB (RBR and MIXED modes), the commit event is the sixth event
     # in the binary log:

=== renamed file 'mysql-test/suite/rpl/t/rpl_rewrt_db.test' => 'mysql-test/extra/rpl_tests/rpl_rewrt_db.test'
--- mysql-test/suite/rpl/t/rpl_rewrt_db.test	2010-12-19 17:07:28 +0000
+++ mysql-test/extra/rpl_tests/rpl_rewrt_db.test	2014-10-22 21:45:42 +0000
@@ -1,6 +1,5 @@
+
 # TBF - difference in row level logging
--- source include/have_binlog_format_mixed_or_statement.inc
--- source include/master-slave.inc
 
 --disable_warnings
 drop database if exists mysqltest1;
@@ -237,4 +236,3 @@
 sync_slave_with_master;
 
 # end of 5.0 tests
---source include/rpl_end.inc

=== modified file 'mysql-test/suite/binlog/r/binlog_database.result'
--- mysql-test/suite/binlog/r/binlog_database.result	2013-10-22 13:33:14 +0000
+++ mysql-test/suite/binlog/r/binlog_database.result	2014-10-22 21:45:42 +0000
@@ -90,7 +90,6 @@
 drop table tt1, t1;
 show binlog events from <binlog_start>;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; create temporary table tt1 (a int)
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (1)
@@ -99,7 +98,7 @@
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 values (1)
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 FLUSH STATUS;
 #

=== removed file 'mysql-test/suite/binlog/r/binlog_format_switch_in_tmp_table.result'
--- mysql-test/suite/binlog/r/binlog_format_switch_in_tmp_table.result	2010-01-26 09:41:15 +0000
+++ mysql-test/suite/binlog/r/binlog_format_switch_in_tmp_table.result	1970-01-01 00:00:00 +0000
@@ -1,78 +0,0 @@
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-MIXED
-CREATE TABLE t1 (a VARCHAR(100));
-CREATE TEMPORARY TABLE t2 (a VARCHAR(100));
-# Test allow switching @@SESSION.binlog_format from MIXED to STATEMENT
-# when there are open temp tables and we are logging in statement based format.
-SET SESSION binlog_format = STATEMENT;
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-STATEMENT
-# Test allow switching @@SESSION.binlog_format from STATEMENT to
-# STATEMENT when there are open temp tables.
-SET SESSION binlog_format = STATEMENT;
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-STATEMENT
-INSERT INTO t1 VALUES ('statement based');
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-STATEMENT
-# Test allow switching @@SESSION.binlog_format from STATEMENT to
-# MIXED when there are open temp tables.
-SET SESSION binlog_format = MIXED;
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-MIXED
-# Test allow switching @@SESSION.binlog_format from MIXED to MIXED
-# when there are open temp tables.
-SET SESSION binlog_format = MIXED;
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-MIXED
-INSERT INTO t2 VALUES (UUID());
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-MIXED
-# Test forbit switching @@SESSION.binlog_format from MIXED to STATEMENT 
-# when there are open temp tables and we are logging in row based format.
-SET SESSION binlog_format = STATEMENT;
-ERROR HY000: Cannot switch out of the row-based binary log format when the session has open temporary tables
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-MIXED
-SET SESSION binlog_format = ROW;
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-ROW
-INSERT INTO t1 VALUES ('row based');
-# Test allow switching @@SESSION.binlog_format from ROW to MIXED 
-# when there are open temp tables.
-SET SESSION binlog_format = MIXED;
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-MIXED
-INSERT INTO t1 VALUES ('row based');
-# Test allow switching @@SESSION.binlog_format from MIXED to ROW
-# when there are open temp tables.
-SET SESSION binlog_format = ROW;
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-ROW
-# Test allow switching @@SESSION.binlog_format from ROW to ROW
-# when there are open temp tables.
-SET SESSION binlog_format = ROW;
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-ROW
-INSERT INTO t1 VALUES ('row based');
-# Test forbit switching @@SESSION.binlog_format from ROW to STATEMENT
-# when there are open temp tables.
-SET SESSION binlog_format = STATEMENT;
-ERROR HY000: Cannot switch out of the row-based binary log format when the session has open temporary tables
-SELECT @@SESSION.binlog_format;
-@@SESSION.binlog_format
-ROW
-DROP TEMPORARY TABLE t2;
-DROP TABLE t1;

=== added file 'mysql-test/suite/binlog/r/binlog_mix_drop_tmp_tbl.result'
--- mysql-test/suite/binlog/r/binlog_mix_drop_tmp_tbl.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/r/binlog_mix_drop_tmp_tbl.result	2014-10-22 21:45:42 +0000
@@ -0,0 +1,57 @@
+DROP DATABASE IF EXISTS `drop-temp+table-test`;
+RESET MASTER;
+CREATE DATABASE `drop-temp+table-test`;
+USE `drop-temp+table-test`;
+CREATE TEMPORARY TABLE shortn1 (a INT);
+CREATE TEMPORARY TABLE `table:name` (a INT);
+CREATE TEMPORARY TABLE shortn2 (a INT);
+CREATE TEMPORARY TABLE tmp(c1 int);
+CREATE TEMPORARY TABLE tmp1(c1 int);
+CREATE TEMPORARY TABLE tmp2(c1 int);
+CREATE TEMPORARY TABLE tmp3(c1 int);
+CREATE TABLE t(c1 int);
+DROP TEMPORARY TABLE IF EXISTS tmp;
+DROP TEMPORARY TABLE IF EXISTS tmp;
+DROP TEMPORARY TABLE IF EXISTS tmp, tmp1;
+DROP TEMPORARY TABLE tmp3;
+DROP TABLE IF EXISTS tmp2, t;
+DROP TABLE IF EXISTS tmp2, t;
+SELECT GET_LOCK("a",10);
+GET_LOCK("a",10)
+1
+USE test;
+SELECT GET_LOCK("a",10);
+GET_LOCK("a",10)
+1
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	CREATE DATABASE `drop-temp+table-test`
+master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; CREATE TABLE t(c1 int)
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp3` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `drop-temp+table-test`.`tmp2` /* generated by server */
+master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; DROP TABLE IF EXISTS `t` /* generated by server */
+master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; DROP TABLE IF EXISTS `tmp2`,`t` /* generated by server */
+master-bin.000001	#	Query	#	#	use `drop-temp+table-test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `shortn2`,`table:name`,`shortn1`
+DROP DATABASE `drop-temp+table-test`;
+RESET MASTER;
+CREATE TABLE t1 ( i text );
+CREATE TEMPORARY TABLE ttmp1 ( i text );
+SET @@session.binlog_format=ROW;
+INSERT INTO t1 VALUES ('1');
+SELECT @@session.binlog_format;
+@@session.binlog_format
+ROW
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 ( i text )
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `ttmp1`
+RESET MASTER;
+DROP TABLE t1;

=== added file 'mysql-test/suite/binlog/r/binlog_mix_tmp_table.result'
--- mysql-test/suite/binlog/r/binlog_mix_tmp_table.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/r/binlog_mix_tmp_table.result	2014-10-22 21:45:42 +0000
@@ -0,0 +1,42 @@
+RESET MASTER;
+create table foo (a int);
+flush logs;
+create temporary table tmp1_foo like foo;
+create temporary table tmp2_foo (a int);
+insert into tmp1_foo values (1), (2), (3), (4);
+replace into tmp2_foo values (1), (2), (3), (4);
+update tmp1_foo set a=2*a-1;
+update tmp2_foo set a=2*a;
+delete from tmp1_foo where a < 5;
+delete from tmp2_foo where a < 5;
+insert into foo select * from tmp1_foo;
+insert into foo select * from tmp2_foo;
+truncate table tmp1_foo;
+truncate table tmp2_foo;
+flush logs;
+select * from foo;
+a
+5
+7
+6
+8
+drop table foo;
+create table foo (a int);
+select * from foo;
+a
+5
+7
+6
+8
+drop table foo;
+RESET MASTER;
+create database b51226;
+use b51226;
+create temporary table t1(i int);
+use b51226;
+create temporary table t1(i int);
+create temporary table t1(i int);
+ERROR 42S01: Table 't1' already exists
+insert into t1 values(1);
+DROP DATABASE b51226;
+FLUSH LOGS;

=== added file 'mysql-test/suite/binlog/r/binlog_row_tmp_table.result'
--- mysql-test/suite/binlog/r/binlog_row_tmp_table.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/r/binlog_row_tmp_table.result	2014-10-22 21:45:42 +0000
@@ -0,0 +1,42 @@
+RESET MASTER;
+create table foo (a int);
+flush logs;
+create temporary table tmp1_foo like foo;
+create temporary table tmp2_foo (a int);
+insert into tmp1_foo values (1), (2), (3), (4);
+replace into tmp2_foo values (1), (2), (3), (4);
+update tmp1_foo set a=2*a-1;
+update tmp2_foo set a=2*a;
+delete from tmp1_foo where a < 5;
+delete from tmp2_foo where a < 5;
+insert into foo select * from tmp1_foo;
+insert into foo select * from tmp2_foo;
+truncate table tmp1_foo;
+truncate table tmp2_foo;
+flush logs;
+select * from foo;
+a
+5
+7
+6
+8
+drop table foo;
+create table foo (a int);
+select * from foo;
+a
+5
+7
+6
+8
+drop table foo;
+RESET MASTER;
+create database b51226;
+use b51226;
+create temporary table t1(i int);
+use b51226;
+create temporary table t1(i int);
+create temporary table t1(i int);
+ERROR 42S01: Table 't1' already exists
+insert into t1 values(1);
+DROP DATABASE b51226;
+FLUSH LOGS;

=== modified file 'mysql-test/suite/binlog/r/binlog_stm_binlog.result'
--- mysql-test/suite/binlog/r/binlog_stm_binlog.result	2011-02-23 11:54:58 +0000
+++ mysql-test/suite/binlog/r/binlog_stm_binlog.result	2014-10-22 21:45:42 +0000
@@ -635,9 +635,7 @@
 COERCIBILITY(s1) d3;
 DROP TEMPORARY TABLE tmp1;
 END
-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` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `bug39182`.`tmp1` /* generated by server */
 DROP PROCEDURE p1;
 DROP TABLE t1;
 DROP DATABASE bug39182;
@@ -704,8 +702,9 @@
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 master-bin.000001	#	Query	#	#	use `test`; create table if not exists t2 select * from t1
-master-bin.000001	#	Query	#	#	use `test`; create temporary table tt1 (a int)
-master-bin.000001	#	Query	#	#	use `test`; create table if not exists t3 like tt1
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE IF NOT EXISTS `t3` (
+  `a` int(11) DEFAULT NULL
+)
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysql`; INSERT INTO user SET host='localhost', user='@#@', password=password('Just a test')
 master-bin.000001	#	Query	#	#	COMMIT
@@ -731,8 +730,9 @@
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int)
 master-bin.000001	#	Query	#	#	use `test`; create table if not exists t2 select * from t1
-master-bin.000001	#	Query	#	#	use `test`; create temporary table tt1 (a int)
-master-bin.000001	#	Query	#	#	use `test`; create table if not exists t3 like tt1
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE IF NOT EXISTS `t3` (
+  `a` int(11) DEFAULT NULL
+)
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysql`; INSERT INTO user SET host='localhost', user='@#@', password=password('Just a test')
 master-bin.000001	#	Query	#	#	COMMIT
@@ -742,7 +742,7 @@
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `mysql`; DELETE FROM user WHERE host='localhost' AND user='@#@'
 master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt1` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t1`,`t2`,`t3` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; create table t1 (a int not null auto_increment, primary key (a)) engine=myisam
 master-bin.000001	#	Query	#	#	BEGIN

=== renamed file 'mysql-test/suite/binlog/r/binlog_tmp_table.result' => 'mysql-test/suite/binlog/r/binlog_stm_tmp_table.result'
=== removed file 'mysql-test/suite/binlog/t/binlog_format_switch_in_tmp_table.test'
--- mysql-test/suite/binlog/t/binlog_format_switch_in_tmp_table.test	2010-01-26 09:41:15 +0000
+++ mysql-test/suite/binlog/t/binlog_format_switch_in_tmp_table.test	1970-01-01 00:00:00 +0000
@@ -1,76 +0,0 @@
-#
-# Bug #45855 row events in binlog after switch from binlog_fmt=mix to stmt with open tmp tbl
-# Bug #45856 can't switch from binlog_format=row to mix with open tmp tbl
-# This test verfies if the program will generate ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR
-# error and forbid switching @@SESSION.binlog_format from MIXED or ROW to
-# STATEMENT when there are open temp tables and we are logging in row format.
-# There is no error in any other case.
-#
-
-source include/have_binlog_format_mixed.inc;
-
-SELECT @@SESSION.binlog_format;
-CREATE TABLE t1 (a VARCHAR(100));
-CREATE TEMPORARY TABLE t2 (a VARCHAR(100));
-
---echo # Test allow switching @@SESSION.binlog_format from MIXED to STATEMENT
---echo # when there are open temp tables and we are logging in statement based format.
-SET SESSION binlog_format = STATEMENT;
-SELECT @@SESSION.binlog_format;
-
---echo # Test allow switching @@SESSION.binlog_format from STATEMENT to
---echo # STATEMENT when there are open temp tables.
-SET SESSION binlog_format = STATEMENT;
-SELECT @@SESSION.binlog_format;
-
-INSERT INTO t1 VALUES ('statement based');
-SELECT @@SESSION.binlog_format;
---echo # Test allow switching @@SESSION.binlog_format from STATEMENT to
---echo # MIXED when there are open temp tables.
-SET SESSION binlog_format = MIXED;
-SELECT @@SESSION.binlog_format;
-
---echo # Test allow switching @@SESSION.binlog_format from MIXED to MIXED
---echo # when there are open temp tables.
-SET SESSION binlog_format = MIXED;
-SELECT @@SESSION.binlog_format;
-
-INSERT INTO t2 VALUES (UUID());
-SELECT @@SESSION.binlog_format;
-
---echo # Test forbit switching @@SESSION.binlog_format from MIXED to STATEMENT 
---echo # when there are open temp tables and we are logging in row based format.
---ERROR ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR
-SET SESSION binlog_format = STATEMENT;
-SELECT @@SESSION.binlog_format;
-
-SET SESSION binlog_format = ROW;
-SELECT @@SESSION.binlog_format;
-
-INSERT INTO t1 VALUES ('row based');
---echo # Test allow switching @@SESSION.binlog_format from ROW to MIXED 
---echo # when there are open temp tables.
-SET SESSION binlog_format = MIXED;
-SELECT @@SESSION.binlog_format;
-
-INSERT INTO t1 VALUES ('row based');
---echo # Test allow switching @@SESSION.binlog_format from MIXED to ROW
---echo # when there are open temp tables.
-SET SESSION binlog_format = ROW;
-SELECT @@SESSION.binlog_format;
-
---echo # Test allow switching @@SESSION.binlog_format from ROW to ROW
---echo # when there are open temp tables.
-SET SESSION binlog_format = ROW;
-SELECT @@SESSION.binlog_format;
-
-INSERT INTO t1 VALUES ('row based');
---echo # Test forbit switching @@SESSION.binlog_format from ROW to STATEMENT
---echo # when there are open temp tables.
---ERROR ER_TEMP_TABLE_PREVENTS_SWITCH_OUT_OF_RBR
-SET SESSION binlog_format = STATEMENT;
-SELECT @@SESSION.binlog_format;
-
-DROP TEMPORARY TABLE t2;
-DROP TABLE t1;
-

=== added file 'mysql-test/suite/binlog/t/binlog_mix_drop_tmp_tbl.test'
--- mysql-test/suite/binlog/t/binlog_mix_drop_tmp_tbl.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/t/binlog_mix_drop_tmp_tbl.test	2014-10-22 21:45:42 +0000
@@ -0,0 +1,4 @@
+# This is a wrapper for binlog.test so that the same test case can be used 
+
+-- source include/have_binlog_format_mixed.inc
+-- source extra/binlog_tests/drop_temp_table.test

=== added file 'mysql-test/suite/binlog/t/binlog_mix_tmp_table.test'
--- mysql-test/suite/binlog/t/binlog_mix_tmp_table.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/t/binlog_mix_tmp_table.test	2014-10-22 21:45:42 +0000
@@ -0,0 +1,2 @@
+source include/have_binlog_format_mixed.inc;
+source extra/binlog_tests/tmp_table.test;

=== added file 'mysql-test/suite/binlog/t/binlog_row_tmp_table.test'
--- mysql-test/suite/binlog/t/binlog_row_tmp_table.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/t/binlog_row_tmp_table.test	2014-10-22 21:45:42 +0000
@@ -0,0 +1,2 @@
+source include/have_binlog_format_row.inc;
+source extra/binlog_tests/tmp_table.test;

=== modified file 'mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test'
--- mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test	2007-06-27 12:28:02 +0000
+++ mysql-test/suite/binlog/t/binlog_stm_drop_tmp_tbl.test	2014-10-22 21:45:42 +0000
@@ -1,5 +1,4 @@
 # This is a wrapper for binlog.test so that the same test case can be used 
-# For both statement and row based bin logs 9/19/2005 [jbm]
 
--- source include/have_binlog_format_mixed_or_statement.inc
+-- source include/have_binlog_format_statement.inc
 -- source extra/binlog_tests/drop_temp_table.test

=== added file 'mysql-test/suite/binlog/t/binlog_stm_tmp_table.test'
--- mysql-test/suite/binlog/t/binlog_stm_tmp_table.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/binlog/t/binlog_stm_tmp_table.test	2014-10-22 21:45:42 +0000
@@ -0,0 +1,2 @@
+source include/have_binlog_format_statement.inc;
+source extra/binlog_tests/tmp_table.test;

=== added file 'mysql-test/suite/rpl/r/rpl_bug58546.result'
--- mysql-test/suite/rpl/r/rpl_bug58546.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/r/rpl_bug58546.result	2014-10-22 21:45:42 +0000
@@ -0,0 +1,44 @@
+include/master-slave.inc
+[connection master]
+
+# Bug#58546 test rpl_packet timeout failure sporadically on PB
+# ----------------------------------------------------------------------
+# STOP SLAVE stopped IO thread first and then stopped SQL thread. It was
+# possible that IO thread stopped after replicating part of a transaction
+# which SQL thread was executing. SQL thread would be hung if the
+# transaction could not be rolled back safely.
+# It caused some sporadic failures on PB2.
+#
+# This test verifies that when 'STOP SLAVE' is issued by a user, IO
+# thread will continue to fetch the rest events of the transaction which
+# is being executed by SQL thread and is not able to be rolled back safely.
+CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB;
+CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
+INSERT INTO t1 VALUES(1, 1);
+[connection master]
+SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
+[connection slave]
+include/restart_slave.inc
+BEGIN;
+UPDATE t1 SET c2 = 2 WHERE c1 = 1;
+[connection master]
+BEGIN;
+INSERT INTO t1 VALUES(2, 2);
+INSERT INTO t2 VALUES(1);
+UPDATE t1 SET c2 = 3 WHERE c1 = 1;
+COMMIT;
+[connection slave1]
+STOP SLAVE;
+[connection slave]
+ROLLBACK;
+[connection master]
+SET DEBUG_SYNC= 'now SIGNAL signal.continue';
+SET DEBUG_SYNC= 'RESET';
+[connection slave]
+include/wait_for_slave_to_stop.inc
+[connection slave1]
+include/start_slave.inc
+[connection master]
+DROP TABLE t1, t2;
+SET GLOBAL debug= $debug_save;
+include/rpl_end.inc

=== added file 'mysql-test/suite/rpl/r/rpl_mix_drop_temp.result'
--- mysql-test/suite/rpl/r/rpl_mix_drop_temp.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/r/rpl_mix_drop_temp.result	2014-10-22 21:45:42 +0000
@@ -0,0 +1,40 @@
+include/master-slave.inc
+[connection master]
+create database if not exists mysqltest;
+use mysqltest;
+create temporary table mysqltest.t1 (n int)ENGINE=MyISAM;
+create temporary table mysqltest.t2 (n int)ENGINE=MyISAM;
+show status like 'Slave_open_temp_tables';
+Variable_name	Value
+Slave_open_temp_tables	0
+drop database mysqltest;
+DROP TEMPORARY TABLE IF EXISTS tmp1;
+Warnings:
+Note	1051	Unknown table 'tmp1'
+CREATE TEMPORARY TABLE t1 ( a int );
+DROP TEMPORARY TABLE t1, t2;
+ERROR 42S02: Unknown table 't2'
+DROP TEMPORARY TABLE tmp2;
+ERROR 42S02: Unknown table 'tmp2'
+stop slave;
+**** On Master ****
+CREATE TEMPORARY TABLE tmp3 (a int);
+DROP TEMPORARY TABLE tmp3;
+SET GLOBAL SQL_SLAVE_SKIP_COUNTER=1;
+START SLAVE;
+include/rpl_reset.inc
+CREATE TABLE t1 ( i INT );
+SHOW STATUS LIKE 'Slave_open_temp_tables';
+Variable_name	Value
+Slave_open_temp_tables	0
+CREATE TEMPORARY TABLE ttmp1 ( i INT );
+SET SESSION binlog_format=ROW;
+SHOW STATUS LIKE 'Slave_open_temp_tables';
+Variable_name	Value
+Slave_open_temp_tables	0
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 ( i INT )
+master-bin.000001	#	Query	#	#	use `test`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `ttmp1`
+DROP TABLE t1;
+include/rpl_end.inc

=== added file 'mysql-test/suite/rpl/r/rpl_mix_rewrt_db.result'
--- mysql-test/suite/rpl/r/rpl_mix_rewrt_db.result	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/r/rpl_mix_rewrt_db.result	2014-10-22 21:45:42 +0000
@@ -0,0 +1,218 @@
+include/master-slave.inc
+[connection master]
+drop database if exists mysqltest1;
+create database mysqltest1;
+use mysqltest1;
+create table t1 (a int);
+insert into t1 values(9);
+select * from mysqltest1.t1;
+a
+9
+show databases like 'mysqltest1';
+Database (mysqltest1)
+mysqltest1
+select * from test.t1;
+a
+9
+drop table t1;
+drop database mysqltest1;
+drop database if exists rewrite;
+create database rewrite;
+use test;
+create table t1 (a date, b date, c date not null, d date);
+load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',';
+Warnings:
+Warning	1265	Data truncated for column 'a' at row 1
+Warning	1265	Data truncated for column 'c' at row 1
+Warning	1265	Data truncated for column 'd' at row 1
+Warning	1265	Data truncated for column 'a' at row 2
+Warning	1265	Data truncated for column 'b' at row 2
+Warning	1265	Data truncated for column 'd' at row 2
+load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' IGNORE 2 LINES;
+select * from rewrite.t1;
+a	b	c	d
+0000-00-00	NULL	0000-00-00	0000-00-00
+0000-00-00	0000-00-00	0000-00-00	0000-00-00
[phone]-03	2003-03-03	NULL
[phone]-03	2003-03-03	NULL
+truncate table t1;
+load data infile '../../std_data/loaddata1.dat' into table t1 fields terminated by ',' LINES STARTING BY ',' (b,c,d);
+Warnings:
+Warning	1265	Data truncated for column 'c' at row 1
+Warning	1265	Data truncated for column 'd' at row 1
+Warning	1265	Data truncated for column 'b' at row 2
+Warning	1265	Data truncated for column 'd' at row 2
+select * from rewrite.t1;
+a	b	c	d
+NULL	NULL	0000-00-00	0000-00-00
+NULL	0000-00-00	0000-00-00	0000-00-00
+NULL	2003-03-03	2003-03-03	NULL
+drop table t1;
+create table t1 (a text, b text);
+load data infile '../../std_data/loaddata2.dat' into table t1 fields terminated by ',' enclosed by '''';
+Warnings:
+Warning	1261	Row 3 doesn't contain data for all columns
+select concat('|',a,'|'), concat('|',b,'|') from rewrite.t1;
+concat('|',a,'|')	concat('|',b,'|')
+|Field A|	|Field B|
+|Field 1|	|Field 2' 
+Field 3,'Field 4|
+|Field 5' ,'Field 6|	NULL
+|Field 6|	| 'Field 7'|
+drop table t1;
+create table t1 (a int, b char(10));
+load data infile '../../std_data/loaddata3.dat' into table t1 fields terminated by '' enclosed by '' ignore 1 lines;
+Warnings:
+Warning	1366	Incorrect integer value: 'error      ' for column 'a' at row 3
+Warning	1262	Row 3 was truncated; it contained more data than there were input columns
+Warning	1366	Incorrect integer value: 'wrong end  ' for column 'a' at row 5
+Warning	1262	Row 5 was truncated; it contained more data than there were input columns
+select * from rewrite.t1;
+a	b
+1	row 1
+2	row 2
+0	1234567890
+3	row 3
+0	1234567890
+truncate table t1;
+load data infile '../../std_data/loaddata4.dat' into table t1 fields terminated by '' enclosed by '' lines terminated by '' ignore 1 lines;
+Warnings:
+Warning	1366	Incorrect integer value: '
+' for column 'a' at row 4
+Warning	1261	Row 4 doesn't contain data for all columns
+select * from rewrite.t1;
+a	b
+1	row 1
+2	row 2
+3	row 3
+0	
+set sql_log_bin= 0;
+drop database rewrite;
+set sql_log_bin= 1;
+set sql_log_bin= 0;
+drop table t1;
+set sql_log_bin= 1;
+
+****
+**** Bug #46861 Auto-closing of temporary tables broken by replicate-rewrite-db
+****
+
+****
+**** Preparing the environment
+****
+SET sql_log_bin= 0;
+CREATE DATABASE database_master_temp_01;
+CREATE DATABASE database_master_temp_02;
+CREATE DATABASE database_master_temp_03;
+SET sql_log_bin= 1;
+SET sql_log_bin= 0;
+CREATE DATABASE database_slave_temp_01;
+CREATE DATABASE database_slave_temp_02;
+CREATE DATABASE database_slave_temp_03;
+SET sql_log_bin= 1;
+
+****
+**** Creating temporary tables on different databases with different connections
+****
+**** con_temp_01 --> creates 
+****                  t_01_01_temp on database_master_temp_01
+****
+**** con_temp_02 --> creates 
+****                  t_01_01_temp on database_master_temp_01
+****                  t_02_01_temp, t_02_02_temp on database_master_temp_02
+****
+**** con_temp_02 --> creates 
+****                  t_01_01_temp on database_master_temp_01
+****                  t_02_01_temp, t_02_02_temp on database_master_temp_02
+****                  t_03_01_temp, t_03_02_temp, t_03_03_temp on database_master_temp_03
+****
+
+con_temp_01
+
+USE database_master_temp_01;
+CREATE TEMPORARY TABLE t_01_01_temp(a int);
+INSERT INTO t_01_01_temp VALUES(1);
+
+con_temp_02
+
+USE database_master_temp_01;
+CREATE TEMPORARY TABLE t_01_01_temp(a int);
+INSERT INTO t_01_01_temp VALUES(1);
+USE database_master_temp_02;
+CREATE TEMPORARY TABLE t_02_01_temp(a int);
+INSERT INTO t_02_01_temp VALUES(1);
+CREATE TEMPORARY TABLE t_02_02_temp(a int);
+INSERT INTO t_02_02_temp VALUES(1);
+
+con_temp_03
+
+USE database_master_temp_01;
+CREATE TEMPORARY TABLE t_01_01_temp(a int);
+INSERT INTO t_01_01_temp VALUES(1);
+USE database_master_temp_02;
+CREATE TEMPORARY TABLE t_02_01_temp(a int);
+INSERT INTO t_02_01_temp VALUES(1);
+CREATE TEMPORARY TABLE t_02_02_temp(a int);
+INSERT INTO t_02_02_temp VALUES(1);
+USE database_master_temp_03;
+CREATE TEMPORARY TABLE t_03_01_temp(a int);
+INSERT INTO t_03_01_temp VALUES(1);
+CREATE TEMPORARY TABLE t_03_02_temp(a int);
+INSERT INTO t_03_02_temp VALUES(1);
+CREATE TEMPORARY TABLE t_03_03_temp(a int);
+INSERT INTO t_03_03_temp VALUES(1);
+
+**** Dropping the connections
+**** We want to SHOW BINLOG EVENTS, to know what was logged. But there is no
+**** guarantee that logging of the terminated con1 has been done yet.a  To be 
+**** sure that logging has been done, we use a user lock.
+
+show status like 'Slave_open_temp_tables';
+Variable_name	Value
+Slave_open_temp_tables	0
+select get_lock("con_01",10);
+get_lock("con_01",10)
+1
+select get_lock("con_01",10);
+get_lock("con_01",10)
+1
+select get_lock("con_02",10);
+get_lock("con_02",10)
+1
+select get_lock("con_02",10);
+get_lock("con_02",10)
+1
+select get_lock("con_03",10);
+get_lock("con_03",10)
+1
+select get_lock("con_03",10);
+get_lock("con_03",10)
+1
+
+**** Checking the binary log and temporary tables
+
+show status like 'Slave_open_temp_tables';
+Variable_name	Value
+Slave_open_temp_tables	0
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	use `database_master_temp_01`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t_01_01_temp`
+master-bin.000001	#	Query	#	#	use `database_master_temp_02`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t_02_02_temp`,`t_02_01_temp`
+master-bin.000001	#	Query	#	#	use `database_master_temp_01`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t_01_01_temp`
+master-bin.000001	#	Query	#	#	use `database_master_temp_03`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t_03_03_temp`,`t_03_02_temp`,`t_03_01_temp`
+master-bin.000001	#	Query	#	#	use `database_master_temp_02`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t_02_02_temp`,`t_02_01_temp`
+master-bin.000001	#	Query	#	#	use `database_master_temp_01`; DROP /*!40005 TEMPORARY */ TABLE IF EXISTS `t_01_01_temp`
+****
+**** Cleaning up the test case
+****
+SET sql_log_bin= 0;
+DROP DATABASE database_master_temp_01;
+DROP DATABASE database_master_temp_02;
+DROP DATABASE database_master_temp_03;
+SET sql_log_bin= 1;
+SET sql_log_bin= 0;
+DROP DATABASE database_slave_temp_01;
+DROP DATABASE database_slave_temp_02;
+DROP DATABASE database_slave_temp_03;
+SET sql_log_bin= 1;
+include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result'
--- mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result	2013-09-26 19:54:16 +0000
+++ mysql-test/suite/rpl/r/rpl_mixed_drop_create_temp_table.result	2014-10-22 21:45:42 +0000
@@ -53,14 +53,14 @@
 DROP TEMPORARY TABLE tt_tmp_2;
 -b-b-b-b-b-b-b-b-b-b-b- >>  << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >>  << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'Drop-Temp-N-Temp';
 DROP TEMPORARY TABLE nt_tmp_2;
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-N-Temp << -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	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-N-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'Drop-Temp-Xe-Temp';
@@ -84,7 +84,7 @@
 ERROR 42S02: Unknown table 'tt_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-TXe-Temp << -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	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-TXe-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'Drop-Temp-If-TXe-Temp';
@@ -101,7 +101,7 @@
 ERROR 42S02: Unknown table 'tt_1'
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-NXe-Temp << -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	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-NXe-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'Drop-Temp-If-NXe-Temp';
@@ -118,22 +118,22 @@
 DROP TEMPORARY TABLE tt_tmp_2, nt_tmp_2;
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-TN-Temp << -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	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-TN-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'Drop-Temp-TT-Temp';
 DROP TEMPORARY TABLE tt_tmp_1, tt_tmp_2;
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-TT-Temp << -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	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1`,`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1`,`test`.`tt_tmp_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-TT-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'Drop-Temp-NN-Temp';
 DROP TEMPORARY TABLE nt_tmp_1, nt_tmp_2;
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-NN-Temp << -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	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_1`,`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1`,`test`.`nt_tmp_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-NN-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 
@@ -149,7 +149,7 @@
 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_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-T-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -167,8 +167,8 @@
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-T-Temp N Drop-Temp-T-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -180,7 +180,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-N-Temp 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	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
@@ -197,13 +197,13 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-N-Temp N Drop-Temp-N-Temp 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	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
@@ -290,7 +290,7 @@
 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_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-TXe-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -310,8 +310,8 @@
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-TXe-Temp N Drop-Temp-TXe-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -362,7 +362,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NXe-Temp 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	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
@@ -381,13 +381,13 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NXe-Temp N Drop-Temp-NXe-Temp 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	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
@@ -449,11 +449,11 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-TN-Temp 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	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-TN-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -467,18 +467,18 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-TN-Temp N Drop-Temp-TN-Temp 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	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-TN-Temp N Drop-Temp-TN-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -491,7 +491,7 @@
 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_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1`,`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1`,`test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-TT-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -508,7 +508,7 @@
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1`,`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1`,`test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-TT-Temp N Drop-Temp-TT-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -520,7 +520,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NN-Temp 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	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_1`,`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1`,`test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
@@ -536,7 +536,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp 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	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_1`,`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1`,`test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
@@ -559,7 +559,7 @@
 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_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-T-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -579,8 +579,8 @@
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1` /* generated by server */
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-T-Temp N Drop-Temp-T-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -592,7 +592,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-N-Temp 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`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
@@ -611,13 +611,13 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-N-Temp N Drop-Temp-N-Temp 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`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
@@ -708,7 +708,7 @@
 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_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-TXe-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -730,8 +730,8 @@
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1` /* generated by server */
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-TXe-Temp N Drop-Temp-TXe-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -784,7 +784,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NXe-Temp 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`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
@@ -805,13 +805,13 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NXe-Temp N Drop-Temp-NXe-Temp 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`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
@@ -875,11 +875,11 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-TN-Temp 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`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-TN-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -895,18 +895,18 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-TN-Temp N Drop-Temp-TN-Temp 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`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1` /* generated by server */
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-TN-Temp N Drop-Temp-TN-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -919,7 +919,7 @@
 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_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1`,`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1`,`test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-TT-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -938,7 +938,7 @@
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1`,`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1`,`test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-Temp-TT-Temp N Drop-Temp-TT-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -950,7 +950,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NN-Temp 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`; DROP TEMPORARY TABLE `nt_tmp_1`,`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1`,`test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
@@ -968,7 +968,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-NN-Temp N Drop-Temp-NN-Temp 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`; DROP TEMPORARY TABLE `nt_tmp_1`,`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1`,`test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
@@ -1074,8 +1074,8 @@
 DROP TABLE tt_tmp_2, nt_tmp_2, nt_2;
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-N-TN-Temp << -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	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `nt_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-N-TN-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -1083,8 +1083,8 @@
 DROP TABLE tt_tmp_2, nt_tmp_2;
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-TN-Temp << -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	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-TN-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 
@@ -1240,8 +1240,8 @@
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	use `test`; DROP TABLE `nt_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-N-TN-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -1254,8 +1254,8 @@
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> B T Drop-TN-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 #########################################################################
@@ -1272,10 +1272,9 @@
 DROP TEMPORARY TABLE nt_tmp_2;
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-N-Temp Create-N-Temp Drop-Temp-N-Temp Drop-Temp-N-Temp << -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	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE nt_tmp_2 ( id INT ) engine= MyIsam
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_1` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-N-Temp Create-N-Temp Drop-Temp-N-Temp Drop-Temp-N-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 SET @commands= 'Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp';
@@ -1285,10 +1284,9 @@
 DROP TEMPORARY TABLE tt_tmp_2;
 -b-b-b-b-b-b-b-b-b-b-b- >> Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp << -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	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_tmp_2 ( id INT ) engine= Innodb
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 -e-e-e-e-e-e-e-e-e-e-e- >> Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp << -e-e-e-e-e-e-e-e-e-e-e-
 
 
@@ -1306,16 +1304,13 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-N-Temp Create-N-Temp Drop-Temp-N-Temp Drop-Temp-N-Temp 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	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE nt_tmp_2 ( id INT ) engine= MyIsam
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_1` /* generated by server */
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
@@ -1332,10 +1327,9 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp 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	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_tmp_2 ( id INT ) engine= Innodb
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -1354,16 +1348,13 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B T Drop-Temp-N-Temp Create-N-Temp Drop-Temp-N-Temp Drop-Temp-N-Temp 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`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE nt_tmp_2 ( id INT ) engine= MyIsam
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_1` /* generated by server */
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	COMMIT
+master-bin.000001	#	Query	#	#	BEGIN
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`nt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_xx_1() VALUES (1)
@@ -1380,10 +1371,9 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp 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`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_tmp_2 ( id INT ) engine= Innodb
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_1` /* generated by server */
-master-bin.000001	#	Query	#	#	use `test`; DROP TEMPORARY TABLE `tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_1` /* generated by server */
+master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`tt_tmp_2` /* generated by server */
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B Drop-Temp-T-Temp Create-T-Temp Drop-Temp-T-Temp Drop-Temp-T-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -1407,13 +1397,8 @@
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_tmp_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1 SELECT * FROM nt_tmp_xx_1
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_tmp_xx_1() VALUES (1)
+master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_xx_1)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> B N N-Temp N-SELECT-N-Temp N-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -1430,9 +1415,6 @@
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_tmp_xx_1() VALUES (1)
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.tt_xx_1)
 master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
@@ -1448,8 +1430,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B N N-Temp N-SELECT-T-Temp N-Temp 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_xx_1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> B N N-Temp N-SELECT-T-Temp N-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -1463,8 +1444,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B N N-Temp T-SELECT-T-Temp N-Temp 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_xx_1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> B N N-Temp T-SELECT-T-Temp N-Temp C << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -1485,8 +1465,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B N N-Temp N-SELECT-N-Temp N-Temp 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_xx_1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Table_map	#	#	table_id: # (test.nt_xx_1)
@@ -1506,8 +1485,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B N N-Temp T-SELECT-N-Temp N-Temp 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_xx_1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> B N N-Temp T-SELECT-N-Temp N-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -1523,8 +1501,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B N N-Temp N-SELECT-T-Temp N-Temp 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_xx_1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> B N N-Temp N-SELECT-T-Temp N-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -1540,8 +1517,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> B N N-Temp T-SELECT-T-Temp N-Temp 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_xx_1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_xx_1() VALUES (1)
 master-bin.000001	#	Query	#	#	COMMIT
 -e-e-e-e-e-e-e-e-e-e-e- >> B N N-Temp T-SELECT-T-Temp N-Temp R << -e-e-e-e-e-e-e-e-e-e-e-
 

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result'
--- mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result	2013-07-27 12:05:02 +0000
+++ mysql-test/suite/rpl/r/rpl_mixed_implicit_commit_binlog.result	2014-10-22 21:45:42 +0000
@@ -390,7 +390,6 @@
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(ddl_case) VALUES (11)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx (a int)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -401,8 +400,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	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(ddl_case) VALUES (10)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -413,8 +411,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	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(ddl_case) VALUES (9)
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -425,8 +422,7 @@
 -b-b-b-b-b-b-b-b-b-b-b- >> << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	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(ddl_case) VALUES (8)
 master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`new_tt_xx` /* generated by server */
 master-bin.000001	#	Xid	#	#	COMMIT /* XID */
 -e-e-e-e-e-e-e-e-e-e-e- >> << -e-e-e-e-e-e-e-e-e-e-e-

=== modified file 'mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result'
--- mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result	2013-07-27 12:05:02 +0000
+++ mysql-test/suite/rpl/r/rpl_mixed_mixing_engines.result	2014-10-22 21:45:42 +0000
@@ -11290,14 +11290,12 @@
 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) VALUES (351, 2)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_11 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> B T CT R << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (351, 2)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_11 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T CT R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -11344,7 +11342,6 @@
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (353, 2)
 master-bin.000001	#	Query	#	#	SAVEPOINT `s1`
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (353, 5)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_12 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	ROLLBACK TO `s1`
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11354,7 +11351,6 @@
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (353, 2)
 master-bin.000001	#	Query	#	#	SAVEPOINT `s1`
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (353, 5)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_12 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	ROLLBACK TO `s1`
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T S1 T CT R1 R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11390,7 +11386,6 @@
 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) VALUES (355, 2)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_13 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (355, 5)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11398,7 +11393,6 @@
 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) VALUES (355, 2)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_13 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (355, 5)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T CT T R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11438,7 +11432,6 @@
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_14 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (357, 5)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11448,7 +11441,6 @@
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id, info) SELECT 357, 2, COUNT(*) FROM tt_1
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_14 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (357, 5)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B tN CT T R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11479,14 +11471,12 @@
 ROLLBACK;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_15 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (359, 3)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -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 CT T R << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_15 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (359, 3)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B CT T R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11526,7 +11516,6 @@
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_16 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (361, 5)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11536,7 +11525,6 @@
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES (361, 2)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_16 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (361, 5)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B N CT T R << -e-e-e-e-e-e-e-e-e-e-e-

=== modified file 'mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result'
--- mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result	2013-07-27 12:05:02 +0000
+++ mysql-test/suite/rpl/r/rpl_non_direct_mixed_mixing_engines.result	2014-10-22 21:45:42 +0000
@@ -11662,14 +11662,12 @@
 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) VALUES (351, 2)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_11 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
 -b-b-b-b-b-b-b-b-b-b-b- >> B T CT R << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (351, 2)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_11 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T CT R << -e-e-e-e-e-e-e-e-e-e-e-
 
@@ -11716,7 +11714,6 @@
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (353, 2)
 master-bin.000001	#	Query	#	#	SAVEPOINT `s1`
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (353, 5)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_12 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	ROLLBACK TO `s1`
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11726,7 +11723,6 @@
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (353, 2)
 master-bin.000001	#	Query	#	#	SAVEPOINT `s1`
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (353, 5)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_12 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	ROLLBACK TO `s1`
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T S1 T CT R1 R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11762,7 +11758,6 @@
 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) VALUES (355, 2)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_13 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (355, 5)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11770,7 +11765,6 @@
 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) VALUES (355, 2)
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_13 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (355, 5)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B T CT T R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11810,7 +11804,6 @@
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_14 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (357, 5)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11820,7 +11813,6 @@
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id, info) SELECT 357, 2, COUNT(*) FROM tt_1
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_14 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (357, 5)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B tN CT T R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11851,14 +11843,12 @@
 ROLLBACK;
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_15 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (359, 3)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -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 CT T R << -b-b-b-b-b-b-b-b-b-b-b-
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_15 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (359, 3)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B CT T R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11898,7 +11888,6 @@
 Warning	1196	Some non-transactional changed tables couldn't be rolled back
 Log_name	Pos	Event_type	Server_id	End_log_pos	Info
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_16 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (361, 5)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> R << -e-e-e-e-e-e-e-e-e-e-e-
@@ -11908,7 +11897,6 @@
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO nt_1(trans_id, stmt_id) VALUES (361, 2)
 master-bin.000001	#	Query	#	#	COMMIT
 master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE tt_xx_16 (a int) engine=Innodb
 master-bin.000001	#	Query	#	#	use `test`; INSERT INTO tt_1(trans_id, stmt_id) VALUES (361, 5)
 master-bin.000001	#	Query	#	#	ROLLBACK
 -e-e-e-e-e-e-e-e-e-e-e- >> B N CT T R << -e-e-e-e-e-e-e-e-e-e-e-

=== renamed file 'mysql-test/suite/rpl/r/rpl_drop_temp.result' => 'mysql-test/suite/rpl/r/rpl_stm_drop_temp.result'
=== renamed file 'mysql-test/suite/rpl/r/rpl_rewrt_db.result' => 'mysql-test/suite/rpl/r/rpl_stm_rewrt_db.result'
=== modified file 'mysql-test/suite/rpl/r/rpl_stop_slave.result'
--- mysql-test/suite/rpl/r/rpl_stop_slave.result	2014-06-26 11:54:27 +0000
+++ mysql-test/suite/rpl/r/rpl_stop_slave.result	2014-10-22 21:45:42 +0000
@@ -78,50 +78,4 @@
 call mtr.add_suppression("Slave SQL.*Request to stop slave SQL Thread received while applying a group that has non-transactional changes; waiting for completion of the group");
 [connection master]
 DROP TABLE t1, t2;
-
-# Bug#58546 test rpl_packet timeout failure sporadically on PB
-# ----------------------------------------------------------------------
-# STOP SLAVE stopped IO thread first and then stopped SQL thread. It was
-# possible that IO thread stopped after replicating part of a transaction
-# which SQL thread was executing. SQL thread would be hung if the
-# transaction could not be rolled back safely.
-# It caused some sporadic failures on PB2.
-#
-# This test verifies that when 'STOP SLAVE' is issued by a user, IO
-# thread will continue to fetch the rest events of the transaction which
-# is being executed by SQL thread and is not able to be rolled back safely.
-CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB;
-CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
-INSERT INTO t1 VALUES(1, 1);
-include/stop_slave.inc
-[connection master]
-include/stop_dump_threads.inc
-SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
-[connection slave]
-include/start_slave.inc
-BEGIN;
-UPDATE t1 SET c2 = 2 WHERE c1 = 1;
-[connection master]
-BEGIN;
-INSERT INTO t1 VALUES(2, 2);
-INSERT INTO t2 VALUES(1);
-UPDATE t1 SET c2 = 3 WHERE c1 = 1;
-COMMIT;
-[connection slave1]
-STOP SLAVE;
-[connection slave]
-ROLLBACK;
-[connection master]
-SET DEBUG_SYNC= 'now SIGNAL signal.continue';
-SET DEBUG_SYNC= 'RESET';
-[connection slave]
-include/wait_for_slave_to_stop.inc
-[connection slave1]
-[connection master]
-SET GLOBAL debug= '$debug_save';
-include/stop_dump_threads.inc
-[connection slave1]
-include/start_slave.inc
-[connection master]
-DROP TABLE t1, t2;
 include/rpl_end.inc

=== removed file 'mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result'
--- mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result	2013-07-27 12:05:02 +0000
+++ mysql-test/suite/rpl/r/rpl_temp_table_mix_row.result	1970-01-01 00:00:00 +0000
@@ -1,111 +0,0 @@
-include/master-slave.inc
-[connection master]
-==== Initialize ====
-[on master]
-CREATE TABLE t1 (a CHAR(48));
-CREATE TEMPORARY TABLE t1_tmp1(a INT);
-INSERT INTO t1 VALUES (UUID());
-[on slave]
-==== Verify results on slave ====
-SHOW STATUS LIKE "Slave_open_temp_tables";
-Variable_name	Value
-Slave_open_temp_tables	1
-[on master]
-[on master1]
-[on slave]
-==== Verify results on slave ====
-SHOW STATUS LIKE "Slave_open_temp_tables";
-Variable_name	Value
-Slave_open_temp_tables	0
-==== Clean up ====
-[on master]
-include/rpl_connect.inc [creating master]
-DROP TABLE t1;
-[on slave]
-include/rpl_reset.inc
-CREATE TABLE t1 (a int);
-CREATE TABLE t2 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) );
-CREATE TABLE t3 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) );
-CREATE TRIGGER tr1 AFTER DELETE ON t2 FOR EACH ROW INSERT INTO t3 () VALUES ();
-CREATE TEMPORARY TABLE t1_tmp (i1 int);
-ALTER TABLE t1_tmp ADD COLUMN b INT;
-DELETE FROM t2;
-CREATE TEMPORARY TABLE t2_tmp (a int);
-ALTER TABLE t1_tmp ADD COLUMN c INT;
-### assertion: assert that there is one open temp table on slave
-SHOW STATUS LIKE 'Slave_open_temp_tables';
-Variable_name	Value
-Slave_open_temp_tables	1
-DROP TABLE t1_tmp, t2;
-INSERT INTO t1 VALUES (1);
-DROP TEMPORARY TABLE t2_tmp;
-INSERT INTO t1 VALUES (2);
-### assertion: assert that slave has no temporary tables opened
-SHOW STATUS LIKE 'Slave_open_temp_tables';
-Variable_name	Value
-Slave_open_temp_tables	0
-DROP TABLE t3, t1;
-show binlog events from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t1 (a int)
-slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t2 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) )
-slave-bin.000001	#	Query	#	#	use `test`; CREATE TABLE t3 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) )
-slave-bin.000001	#	Query	#	#	use `test`; CREATE DEFINER=`root`@`localhost` TRIGGER tr1 AFTER DELETE ON t2 FOR EACH ROW INSERT INTO t3 () VALUES ()
-slave-bin.000001	#	Query	#	#	use `test`; CREATE TEMPORARY TABLE t1_tmp (i1 int)
-slave-bin.000001	#	Query	#	#	use `test`; ALTER TABLE t1_tmp ADD COLUMN b INT
-slave-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`t1_tmp` /* generated by server */
-slave-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t2` /* generated by server */
-slave-bin.000001	#	Query	#	#	BEGIN
-slave-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
-slave-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-slave-bin.000001	#	Xid	#	#	COMMIT /* XID */
-slave-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`t2_tmp` /* generated by server */
-slave-bin.000001	#	Query	#	#	BEGIN
-slave-bin.000001	#	Query	#	#	use `test`; INSERT INTO t1 VALUES (2)
-slave-bin.000001	#	Xid	#	#	COMMIT /* XID */
-slave-bin.000001	#	Query	#	#	use `test`; DROP TABLE `t3`,`t1` /* generated by server */
-
-# Bug#55478 Row events wrongly apply on the temporary table of the same name
-# ==========================================================================
-# The statement should be binlogged
-CREATE TEMPORARY TABLE t1(c1 INT) ENGINE=InnoDB;
-
-# Case 1: CREATE TABLE t1 ... SELECT
-# ----------------------------------
-
-# The statement generates row events on t1. And the rows events should
-# be inserted into the base table on slave.
-CREATE TABLE t1 ENGINE=MyISAM SELECT rand();
-show binlog events in 'master-bin.000001' 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`; CREATE TABLE `t1` (
-  `rand()` double NOT NULL DEFAULT '0'
-) ENGINE=MyISAM
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
-
-# Case 2: DROP TEMPORARY TABLE in a transacation
-# ----------------------------------------------
-
-BEGIN;
-DROP TEMPORARY TABLE t1;
-# The rows event will binlogged before 'DROP TEMPORARY TABLE t1',
-# as t1 is non-transactional table
-INSERT INTO t1 VALUES(Rand());
-COMMIT;
-show binlog events in 'master-bin.000001' from <binlog_start>;
-Log_name	Pos	Event_type	Server_id	End_log_pos	Info
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Table_map	#	#	table_id: # (test.t1)
-master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
-master-bin.000001	#	Query	#	#	COMMIT
-master-bin.000001	#	Query	#	#	BEGIN
-master-bin.000001	#	Query	#	#	DROP TEMPORARY TABLE IF EXISTS `test`.`t1` /* generated by server */
-master-bin.000001	#	Query	#	#	COMMIT
-# Compare the base table.
-include/diff_tables.inc [master:t1, slave:t1]
-
-DROP TABLE t1;
-include/rpl_end.inc

=== added file 'mysql-test/suite/rpl/t/rpl_bug58546.test'
--- mysql-test/suite/rpl/t/rpl_bug58546.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/t/rpl_bug58546.test	2014-10-22 21:45:42 +0000
@@ -0,0 +1,69 @@
+source include/master-slave.inc;
+source include/have_innodb.inc;
+source include/have_debug.inc;
+source include/have_debug_sync.inc;
+source include/have_binlog_format_mixed_or_statement.inc;
+
+--echo
+--echo # Bug#58546 test rpl_packet timeout failure sporadically on PB
+--echo # ----------------------------------------------------------------------
+--echo # STOP SLAVE stopped IO thread first and then stopped SQL thread. It was
+--echo # possible that IO thread stopped after replicating part of a transaction
+--echo # which SQL thread was executing. SQL thread would be hung if the
+--echo # transaction could not be rolled back safely.
+--echo # It caused some sporadic failures on PB2.
+--echo #
+--echo # This test verifies that when 'STOP SLAVE' is issued by a user, IO
+--echo # thread will continue to fetch the rest events of the transaction which
+--echo # is being executed by SQL thread and is not able to be rolled back safely.
+
+CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB;
+CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
+INSERT INTO t1 VALUES(1, 1);
+
+sync_slave_with_master;
+
+--source include/rpl_connection_master.inc
+
+let $debug_save= `SELECT @@GLOBAL.debug`;
+SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
+
+--source include/rpl_connection_slave.inc
+source include/restart_slave_sql.inc;
+
+BEGIN;
+UPDATE t1 SET c2 = 2 WHERE c1 = 1;
+
+--source include/rpl_connection_master.inc
+BEGIN;
+INSERT INTO t1 VALUES(2, 2);
+INSERT INTO t2 VALUES(1);
+UPDATE t1 SET c2 = 3 WHERE c1 = 1;
+COMMIT;
+
+--source include/rpl_connection_slave1.inc
+let $show_statement= SHOW PROCESSLIST;
+let $field= Info;
+let $condition= = 'UPDATE t1 SET c2 = 3 WHERE c1 = 1';
+source include/wait_show_condition.inc;
+
+send STOP SLAVE;
+
+--source include/rpl_connection_slave.inc
+ROLLBACK;
+
+--source include/rpl_connection_master.inc
+SET DEBUG_SYNC= 'now SIGNAL signal.continue';
+SET DEBUG_SYNC= 'RESET';
+
+--source include/rpl_connection_slave.inc
+source include/wait_for_slave_to_stop.inc;
+
+--source include/rpl_connection_slave1.inc
+reap;
+source include/start_slave.inc;
+
+--source include/rpl_connection_master.inc
+DROP TABLE t1, t2;
+SET GLOBAL debug= $debug_save;
+--source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test'
--- mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test	2013-09-26 19:54:16 +0000
+++ mysql-test/suite/rpl/t/rpl_create_tmp_table_if_not_exists.test	2014-10-22 21:45:42 +0000
@@ -24,8 +24,9 @@
 
 source include/master-slave.inc;
 #CREATE TEMPORARY TABLE statements are not binlogged in row mode,
+#nor in mixed mode
 #So it must be test by itself.
-source include/have_binlog_format_mixed_or_statement.inc;
+source include/have_binlog_format_statement.inc;
 disable_warnings;
 
 DROP DATABASE IF EXISTS mysqltest;

=== added file 'mysql-test/suite/rpl/t/rpl_mix_drop_temp-slave.opt'
--- mysql-test/suite/rpl/t/rpl_mix_drop_temp-slave.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/t/rpl_mix_drop_temp-slave.opt	2014-10-22 21:45:42 +0000
@@ -0,0 +1,2 @@
+--replicate-ignore-table=mysqltest.t2
+

=== added file 'mysql-test/suite/rpl/t/rpl_mix_drop_temp.test'
--- mysql-test/suite/rpl/t/rpl_mix_drop_temp.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/t/rpl_mix_drop_temp.test	2014-10-22 21:45:42 +0000
@@ -0,0 +1,6 @@
+source include/master-slave.inc;
+source include/have_binlog_format_mixed.inc;
+
+source extra/rpl_tests/rpl_drop_temp.test;
+
+source include/rpl_end.inc;

=== added file 'mysql-test/suite/rpl/t/rpl_mix_rewrt_db-slave.opt'
--- mysql-test/suite/rpl/t/rpl_mix_rewrt_db-slave.opt	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/t/rpl_mix_rewrt_db-slave.opt	2014-10-22 21:45:42 +0000
@@ -0,0 +1,1 @@
+"--replicate-rewrite-db=test->rewrite" "--replicate-rewrite-db=mysqltest1->test"  "--replicate-rewrite-db=database_master_temp_01->database_slave_temp_01" "--replicate-rewrite-db=database_master_temp_02->database_slave_temp_02" "--replicate-rewrite-db=database_master_temp_03->database_slave_temp_03"

=== added file 'mysql-test/suite/rpl/t/rpl_mix_rewrt_db.test'
--- mysql-test/suite/rpl/t/rpl_mix_rewrt_db.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/t/rpl_mix_rewrt_db.test	2014-10-22 21:45:42 +0000
@@ -0,0 +1,7 @@
+# TBF - difference in row level logging
+-- source include/have_binlog_format_mixed.inc
+-- source include/master-slave.inc
+
+-- source extra/rpl_tests/rpl_rewrt_db.test
+
+-- source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_row_reset_slave.test'
--- mysql-test/suite/rpl/t/rpl_row_reset_slave.test	2007-06-27 12:28:02 +0000
+++ mysql-test/suite/rpl/t/rpl_row_reset_slave.test	2014-10-22 21:45:42 +0000
@@ -1,5 +1,5 @@
 # TBF - difference in row level logging
-# Temp tables are not replicated in rbr, but it is still good to hit rbr with everthing
--- source include/have_binlog_format_row.inc
+# Temp tables are not replicated in rbr or mixed, but it is still good to hit rbr with everthing
+-- source include/have_binlog_format_mixed_or_row.inc
 -- source extra/rpl_tests/rpl_reset_slave.test
 

=== renamed file 'mysql-test/suite/rpl/t/rpl_drop_temp-slave.opt' => 'mysql-test/suite/rpl/t/rpl_stm_drop_temp-slave.opt'
=== added file 'mysql-test/suite/rpl/t/rpl_stm_drop_temp.test'
--- mysql-test/suite/rpl/t/rpl_stm_drop_temp.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/t/rpl_stm_drop_temp.test	2014-10-22 21:45:42 +0000
@@ -0,0 +1,6 @@
+source include/master-slave.inc;
+source include/have_binlog_format_statement.inc;
+
+source extra/rpl_tests/rpl_drop_temp.test;
+
+source include/rpl_end.inc;

=== modified file 'mysql-test/suite/rpl/t/rpl_stm_reset_slave.test'
--- mysql-test/suite/rpl/t/rpl_stm_reset_slave.test	2007-06-27 12:28:02 +0000
+++ mysql-test/suite/rpl/t/rpl_stm_reset_slave.test	2014-10-22 21:45:42 +0000
@@ -1,5 +1,5 @@
 # TBF - difference in row level logging
--- source include/have_binlog_format_mixed_or_statement.inc
+-- source include/have_binlog_format_statement.inc
 -- source extra/rpl_tests/rpl_reset_slave.test
 
 # End of 4.1 tests

=== renamed file 'mysql-test/suite/rpl/t/rpl_rewrt_db-slave.opt' => 'mysql-test/suite/rpl/t/rpl_stm_rewrt_db-slave.opt'
=== added file 'mysql-test/suite/rpl/t/rpl_stm_rewrt_db.test'
--- mysql-test/suite/rpl/t/rpl_stm_rewrt_db.test	1970-01-01 00:00:00 +0000
+++ mysql-test/suite/rpl/t/rpl_stm_rewrt_db.test	2014-10-22 21:45:42 +0000
@@ -0,0 +1,7 @@
+# TBF - difference in row level logging
+-- source include/have_binlog_format_statement.inc
+-- source include/master-slave.inc
+
+-- source extra/rpl_tests/rpl_rewrt_db.test
+
+-- source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_stop_slave.test'
--- mysql-test/suite/rpl/t/rpl_stop_slave.test	2014-06-26 11:54:27 +0000
+++ mysql-test/suite/rpl/t/rpl_stop_slave.test	2014-10-22 21:45:42 +0000
@@ -2,7 +2,10 @@
 source include/have_innodb.inc;
 source include/have_debug.inc;
 source include/have_debug_sync.inc;
-source include/have_binlog_format_mixed_or_statement.inc;
+
+# lp:1313901 renders this case irrelevant for mixed mode as temp tables are no
+# longer replicated to the slave.
+source include/have_binlog_format_statement.inc;
 
 --echo
 --echo # BUG#56118 STOP SLAVE does not wait till trx with CREATE TMP TABLE ends
@@ -54,91 +57,8 @@
 --source include/rpl_connection_master.inc
 DROP TABLE t1, t2;
 
---echo
---echo # Bug#58546 test rpl_packet timeout failure sporadically on PB
---echo # ----------------------------------------------------------------------
---echo # STOP SLAVE stopped IO thread first and then stopped SQL thread. It was
---echo # possible that IO thread stopped after replicating part of a transaction
---echo # which SQL thread was executing. SQL thread would be hung if the
---echo # transaction could not be rolled back safely.
---echo # It caused some sporadic failures on PB2.
---echo #
---echo # This test verifies that when 'STOP SLAVE' is issued by a user, IO
---echo # thread will continue to fetch the rest events of the transaction which
---echo # is being executed by SQL thread and is not able to be rolled back safely.
-
-CREATE TABLE t1 (c1 INT KEY, c2 INT) ENGINE=InnoDB;
-CREATE TABLE t2 (c1 INT) ENGINE=MyISAM;
-INSERT INTO t1 VALUES(1, 1);
-
-sync_slave_with_master;
---source include/stop_slave.inc
-
---source include/rpl_connection_master.inc
-# make sure that there are no zombie threads
---source include/stop_dump_threads.inc
-
-let $debug_save= `SELECT @@GLOBAL.debug`;
-SET GLOBAL debug= 'd,dump_thread_wait_before_send_xid';
-
---source include/rpl_connection_slave.inc
---source include/start_slave.inc
-
-BEGIN;
-UPDATE t1 SET c2 = 2 WHERE c1 = 1;
-
---source include/rpl_connection_master.inc
-BEGIN;
-INSERT INTO t1 VALUES(2, 2);
-INSERT INTO t2 VALUES(1);
-UPDATE t1 SET c2 = 3 WHERE c1 = 1;
-COMMIT;
-
-# wait for the dump thread reach the sync point
---let $wait_condition= select count(*)=1 from information_schema.processlist where state LIKE '%debug sync point%' and command='Binlog Dump'
---source include/wait_condition.inc
-
---source include/rpl_connection_slave1.inc
-let $show_statement= SHOW PROCESSLIST;
-let $field= Info;
-let $condition= = 'UPDATE t1 SET c2 = 3 WHERE c1 = 1';
-source include/wait_show_condition.inc;
-
-send STOP SLAVE;
-
---source include/rpl_connection_slave.inc
-ROLLBACK;
-
---source include/rpl_connection_master.inc
-
-SET DEBUG_SYNC= 'now SIGNAL signal.continue';
-# wait for the dump thread to come out of the
-# waiting phase before resetting the signals
---let $wait_condition= select count(*)=0 from information_schema.processlist where state LIKE '%debug sync point%' and command='Binlog Dump'
---source include/wait_condition.inc
-SET DEBUG_SYNC= 'RESET';
-
---source include/rpl_connection_slave.inc
-source include/wait_for_slave_to_stop.inc;
-
---source include/rpl_connection_slave1.inc
-reap;
-
-# Slave has stopped, thence lets make sure that
-# we kill the zombie dump threads. Also, make
-# sure that we disable the DBUG_EXECUTE_IF
-# that would set the dump thread to wait
---source include/rpl_connection_master.inc
-SET GLOBAL debug= '$debug_save';
-# make sure that there are no zombie threads
---source include/stop_dump_threads.inc
-
---source include/rpl_connection_slave1.inc
-# now the dump thread on the master will start
-# from a clean slate, i.e. without the
-# DBUG_EXECUTE_IF set
-source include/start_slave.inc;
-
---source include/rpl_connection_master.inc
-DROP TABLE t1, t2;
+# Bug#58546 test rpl_packet timeout failure sporadically on PB
+# Moved into its own test rpl.rpl_bug58546.test to allow it to continue
+# to test both MBR and SBR
+ 
 --source include/rpl_end.inc

=== removed file 'mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test'
--- mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test	2010-12-19 17:15:12 +0000
+++ mysql-test/suite/rpl/t/rpl_temp_table_mix_row.test	1970-01-01 00:00:00 +0000
@@ -1,210 +0,0 @@
-# ==== Purpose ====
-#
-# Test that temporary tables are correctly replicated after switching to ROW format in MIX mode.
-# This test case will test the condition of the bug#40013.
-# The test step is:
-#   1: create temp table on connection 'master';
-#   2: switch to ROW format using 'INSERT INTO t1 VALUES (UUID());'
-#   3: disconnect 'master' and connect to a new connection 'master1';
-#   4: sync to slave and check the number of temp tables on slave.
-#
-
-source include/master-slave.inc;
-source include/have_binlog_format_mixed.inc;
-source include/have_innodb.inc;
-
---echo ==== Initialize ====
-
---echo [on master]
---connection master
-
-CREATE TABLE t1 (a CHAR(48));
-CREATE TEMPORARY TABLE t1_tmp1(a INT);
-INSERT INTO t1 VALUES (UUID());
-
---echo [on slave]
-sync_slave_with_master;
-
---echo ==== Verify results on slave ====
-SHOW STATUS LIKE "Slave_open_temp_tables";
-
---echo [on master]
---connection master
-
-disconnect master;
---echo [on master1]
---connection master1
-
-# waiting DROP TEMPORARY TABLE event to be written into binlog
-let $wait_binlog_event= DROP;
-source include/wait_for_binlog_event.inc;
-
---echo [on slave]
-sync_slave_with_master;
-
---echo ==== Verify results on slave ====
-SHOW STATUS LIKE "Slave_open_temp_tables";
-
---echo ==== Clean up ====
-
---echo [on master]
---let $rpl_connection_name= master
---let $rpl_server_number= 1
---source include/rpl_connect.inc
---connection master
-DROP TABLE t1;
-
---echo [on slave]
-sync_slave_with_master;
-
-#
-# BUG#43046: mixed mode switch to row format with temp table lead to wrong
-# result
-#
-# NOTES
-# =====
-#  
-#  1. Temporary tables cannot be logged using the row-based
-#     format. Thus, once row-based logging is used, all subsequent
-#     statements using that table are unsafe, and we approximate this
-#     condition by treating all statements made by that client as
-#     unsafe until the client no longer holds any temporary tables.
-#
-#  2. Two different connections can use the same temporary table
-#     name without conflicting with each other or with an
-#     existing non-TEMPORARY table of the same name.
-#
-# DESCRIPTION
-# ===========
-#  
-#   The test is implemented as follows:
-#     1. create regular tables 
-#     2. create a temporary table t1_tmp: should be logged as statement
-#     3. issue an alter table: should be logged as statement
-#     4. issue statement that forces switch to RBR
-#     5. create another temporary table t2_tmp: should not be logged
-#     6. issue alter table on t1_tmp: should not be logged
-#     7. drop t1_tmp and regular table on same statement: should log both in
-#        statement format (but different statements)
-#     8. issue deterministic insert: logged as row (because t2_tmp still
-#        exists).
-#     9. drop t2_tmp and issue deterministic statement: should log drop and
-#        query in statement format (show switch back to STATEMENT format)
-#    10. in the end the slave should not have open temp tables.
-#  
-
---source include/rpl_reset.inc
--- connection master
-
-# action: setup environment
-CREATE TABLE t1 (a int);
-CREATE TABLE t2 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) );
-CREATE TABLE t3 ( i1 INT NOT NULL AUTO_INCREMENT, PRIMARY KEY (i1) );
-CREATE TRIGGER tr1 AFTER DELETE ON t2 FOR EACH ROW INSERT INTO t3 () VALUES ();
-
-# assertion: assert that CREATE is logged as STATEMENT
-CREATE TEMPORARY TABLE t1_tmp (i1 int);
-
-# assertion: assert that ALTER TABLE is logged as STATEMENT
-ALTER TABLE t1_tmp ADD COLUMN b INT;
-
-# action: force switch to RBR
-DELETE FROM t2;
-
-# assertion: assert that t2_tmp will not make into the binlog (RBR logging atm)
-CREATE TEMPORARY TABLE t2_tmp (a int);
-
-# assertion: assert that ALTER TABLE on t1_tmp will not make into the binlog
-ALTER TABLE t1_tmp ADD COLUMN c INT;
-
--- echo ### assertion: assert that there is one open temp table on slave
--- sync_slave_with_master
-SHOW STATUS LIKE 'Slave_open_temp_tables';
-
--- connection master
-
-# assertion: assert that both drops are logged
-DROP TABLE t1_tmp, t2;
-
-# assertion: assert that statement is logged as row (master still has one
-#            opened temporary table - t2_tmp.
-INSERT INTO t1 VALUES (1);
-
-# assertion: assert that DROP TABLE *is* logged despite CREATE is not.
-DROP TEMPORARY TABLE t2_tmp;
-
-# assertion: assert that statement is now logged as STMT (mixed mode switches
-#            back to STATEMENT).
-INSERT INTO t1 VALUES (2);
-
--- sync_slave_with_master
-
--- echo ### assertion: assert that slave has no temporary tables opened
-SHOW STATUS LIKE 'Slave_open_temp_tables';
-
--- connection master
-
-# action: drop remaining tables
-DROP TABLE t3, t1;
-
--- sync_slave_with_master
-
--- source include/show_binlog_events.inc
-
---echo
---echo # Bug#55478 Row events wrongly apply on the temporary table of the same name
---echo # ==========================================================================
-connection master;
-
-let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
-let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
-
---echo # The statement should be binlogged
-CREATE TEMPORARY TABLE t1(c1 INT) ENGINE=InnoDB;
-
---echo
---echo # Case 1: CREATE TABLE t1 ... SELECT
---echo # ----------------------------------
-let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
-let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
-
---echo
---echo # The statement generates row events on t1. And the rows events should
---echo # be inserted into the base table on slave.
-CREATE TABLE t1 ENGINE=MyISAM SELECT rand();
-
-source include/show_binlog_events.inc;
-let $binlog_file= query_get_value(SHOW MASTER STATUS, File, 1);
-let $binlog_start= query_get_value(SHOW MASTER STATUS, Position, 1);
-
---echo
---echo # Case 2: DROP TEMPORARY TABLE in a transacation
---echo # ----------------------------------------------
---echo
-
-BEGIN;
-DROP TEMPORARY TABLE t1;
-
-# The patch for BUG#55478 fixed the problem only on RBR. The problem on SBR
-# will be fixed by the patch for bug#55709. So This statement cannot be
-# executed until Bug#55709 is fixed
-#
-# INSERT INTO t1 VALUES(1);
-
---echo # The rows event will binlogged before 'DROP TEMPORARY TABLE t1',
---echo # as t1 is non-transactional table
-INSERT INTO t1 VALUES(Rand());
-COMMIT;
-
-source include/show_binlog_events.inc;
-
---sync_slave_with_master
-
---echo # Compare the base table.
---let $diff_tables= master:t1, slave:t1
---source include/diff_tables.inc
-
---echo
-connection master;
-DROP TABLE t1;
---source include/rpl_end.inc

=== modified file 'mysql-test/suite/rpl/t/rpl_trunc_temp.test'
--- mysql-test/suite/rpl/t/rpl_trunc_temp.test	2010-12-19 17:07:28 +0000
+++ mysql-test/suite/rpl/t/rpl_trunc_temp.test	2014-10-22 21:45:42 +0000
@@ -20,8 +20,9 @@
 
 
 # Requires statement-based logging since temporary tables are not
-# logged in row-based logging
--- source include/have_binlog_format_mixed_or_statement.inc
+# logged in row-based logging. Same now goes for mixed, valid for statement
+# only replication as a result of lp:1313901
+-- source include/have_binlog_format_statement.inc
 
 source include/master-slave.inc;
 

=== modified file 'sql/sql_class.cc'
--- sql/sql_class.cc	2014-08-22 09:58:37 +0000
+++ sql/sql_class.cc	2014-10-22 21:45:42 +0000
@@ -4566,6 +4566,11 @@
     */
     my_bool multi_access_engine= FALSE;
     /*
+       bug 1313901 : Track if statement creates or drops a temporary table
+                     and log in ROW if it does.
+    */
+    my_bool create_drop_temp_table= FALSE;
+    /*
       Identifies if a table is changed.
     */
     my_bool is_write= FALSE;
@@ -4597,7 +4602,25 @@
     for (TABLE_LIST *table= tables; table; table= table->next_global)
     {
       if (table->placeholder())
+      {
+        /*
+          bug 1313901 : Detect if this is a CREATE TEMPORARY or DROP of a
+                        temporary table. This will be used later in determining
+                        whether to log in ROW or STMT if MIXED replication is
+                        being used.
+        */
+        if(!create_drop_temp_table &&
+           !table->table &&
+            ((lex->sql_command == SQLCOM_CREATE_TABLE &&
+              (lex->create_info.options & HA_LEX_CREATE_TMP_TABLE)) ||
+             ((lex->sql_command == SQLCOM_DROP_TABLE ||
+               lex->sql_command == SQLCOM_TRUNCATE) &&
+              find_temporary_table(this, table))))
+        {
+          create_drop_temp_table= TRUE;
+        }
         continue;
+      }
 
       if (table->table->s->table_category == TABLE_CATEGORY_PERFORMANCE ||
           table->table->s->table_category == TABLE_CATEGORY_LOG)
@@ -4605,6 +4628,8 @@
 
       handler::Table_flags const flags= table->table->file->ha_table_flags();
 
+      my_bool trans= table->table->file->has_transactions();
+
       DBUG_PRINT("info", ("table: %s; ha_table_flags: 0x%llx",
                           table->table_name, flags));
       if (table->lock_type >= TL_WRITE_ALLOW_WRITE)
@@ -4613,8 +4638,6 @@
             table->table->file->ht)
           multi_write_engine= TRUE;
 
-        my_bool trans= table->table->file->has_transactions();
-
         if (table->table->s->tmp_table)
           lex->set_stmt_accessed_table(trans ? LEX::STMT_WRITES_TEMP_TRANS_TABLE :
                                                LEX::STMT_WRITES_TEMP_NON_TRANS_TABLE);
@@ -4631,18 +4654,15 @@
       }
       flags_access_some_set |= flags;
 
-      if (lex->sql_command != SQLCOM_CREATE_TABLE ||
-          (lex->sql_command == SQLCOM_CREATE_TABLE &&
-          (lex->create_info.options & HA_LEX_CREATE_TMP_TABLE)))
-      {
-        my_bool trans= table->table->file->has_transactions();
-
-        if (table->table->s->tmp_table)
-          lex->set_stmt_accessed_table(trans ? LEX::STMT_READS_TEMP_TRANS_TABLE :
-                                               LEX::STMT_READS_TEMP_NON_TRANS_TABLE);
-        else
-          lex->set_stmt_accessed_table(trans ? LEX::STMT_READS_TRANS_TABLE :
-                                               LEX::STMT_READS_NON_TRANS_TABLE);
+      if (table->table->s->tmp_table)
+      {
+        lex->set_stmt_accessed_table(trans ? LEX::STMT_READS_TEMP_TRANS_TABLE :
+                                             LEX::STMT_READS_TEMP_NON_TRANS_TABLE);
+      }
+      else
+      {
+        lex->set_stmt_accessed_table(trans ? LEX::STMT_READS_TRANS_TABLE :
+                                             LEX::STMT_READS_NON_TRANS_TABLE);
       }
 
       if (prev_access_table && prev_access_table->file->ht !=
@@ -4774,7 +4794,10 @@
       else
       {
         if (lex->is_stmt_unsafe() || lex->is_stmt_row_injection()
-            || (flags_write_all_set & HA_BINLOG_STMT_CAPABLE) == 0)
+            || (flags_write_all_set & HA_BINLOG_STMT_CAPABLE) == 0
+            || lex->stmt_accessed_table(LEX::STMT_READS_TEMP_TRANS_TABLE)
+            || lex->stmt_accessed_table(LEX::STMT_READS_TEMP_NON_TRANS_TABLE)
+            || create_drop_temp_table)
         {
           /* log in row format! */
           set_current_stmt_binlog_format_row_if_mixed();

=== modified file 'sql/sql_class.h'
--- sql/sql_class.h	2014-06-06 14:58:40 +0000
+++ sql/sql_class.h	2014-10-22 21:45:42 +0000
@@ -2812,30 +2812,15 @@
   inline void reset_current_stmt_binlog_format_row()
   {
     DBUG_ENTER("reset_current_stmt_binlog_format_row");
-    /*
-      If there are temporary tables, don't reset back to
-      statement-based. Indeed it could be that:
-      CREATE TEMPORARY TABLE t SELECT UUID(); # row-based
-      # and row-based does not store updates to temp tables
-      # in the binlog.
-      INSERT INTO u SELECT * FROM t; # stmt-based
-      and then the INSERT will fail as data inserted into t was not logged.
-      So we continue with row-based until the temp table is dropped.
-      If we are in a stored function or trigger, we mustn't reset in the
-      middle of its execution (as the binary logging way of a stored function
-      or trigger is decided when it starts executing, depending for example on
-      the caller (for a stored function: if caller is SELECT or
-      INSERT/UPDATE/DELETE...).
-    */
     DBUG_PRINT("debug",
-               ("temporary_tables: %s, in_sub_stmt: %s, system_thread: %s",
-                YESNO(temporary_tables), YESNO(in_sub_stmt),
+               ("in_sub_stmt: %s, system_thread: %s",
+                YESNO(in_sub_stmt),
                 show_system_thread(system_thread)));
     if (in_sub_stmt == 0)
     {
       if (variables.binlog_format == BINLOG_FORMAT_ROW)
         set_current_stmt_binlog_format_row();
-      else if (temporary_tables == NULL)
+      else
         clear_current_stmt_binlog_format_row();
     }
     DBUG_VOID_RETURN;

=== modified file 'sql/sql_table.cc'
--- sql/sql_table.cc	2014-08-22 09:58:37 +0000
+++ sql/sql_table.cc	2014-10-22 21:45:42 +0000
@@ -1891,6 +1891,15 @@
 
   DBUG_ENTER("mysql_rm_table");
 
+  /*
+    bug 1313901 : DROP tables need to have their logging format determined if
+                  in MIXED mode and dropping a TEMP table.
+  */
+  if (thd->decide_logging_format(tables))
+  {
+    DBUG_RETURN(TRUE);
+  }
+
   /* Disable drop of enabled log tables, must be done before name locking */
   for (table= tables; table; table= table->next_local)
   {
@@ -4648,8 +4657,12 @@
     that we can safely perform table creation.
     Thus by holding both these locks we ensure that our statement is
     properly isolated from all concurrent operations which matter.
+
+    bug 1313901 : CREATE LIKE needs to have the logging format determined if
+                  in MIXED mode and creating LIKE a TEMP table.
   */
-  if (open_tables(thd, &thd->lex->query_tables, &not_used, 0))
+  if (open_tables(thd, &thd->lex->query_tables, &not_used, 0) ||
+      thd->decide_logging_format(thd->lex->query_tables))
   {
     res= thd->is_error();
     goto err;

=== modified file 'sql/sql_truncate.cc'
--- sql/sql_truncate.cc	2014-06-03 13:14:25 +0000
+++ sql/sql_truncate.cc	2014-10-22 21:45:42 +0000
@@ -432,6 +432,14 @@
   /* If it is a temporary table, no need to take locks. */
   if ((table= find_temporary_table(thd, table_ref)))
   {
+    /*    
+      bug 1313901 : THD::decide_logging_format has not yet been called and
+                    may not be called at all dependig on the engine, so call it
+                    here.
+    */
+    if (thd->decide_logging_format(table_ref) != 0)
+      DBUG_RETURN(TRUE);
+
     /* In RBR, the statement is not binlogged if the table is temporary. */
     binlog_stmt= !thd->is_current_stmt_binlog_format_row();