Manual Merge

mysql-test/extra/binlog_tests/drop_temp_table.test

@@ -48,6 +48,16 @@ DROP TABLE IF EXISTS tmp2, t;
 --enable_warnings
 
 SELECT GET_LOCK("a",10);
+
+#
+# BUG48216 Replication fails on all slaves after upgrade to 5.0.86 on master
+#
+# When the session is closed, any temporary tables of the session are dropped
+# and are binlogged. But it will be binlogged with a wrong database name when
+# the length of the database name('drop-temp-table-test') is greater than the
+# current database name('test').
+#
+USE test;
 disconnect con1;
 
 connection con2;

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

@@ -19,6 +19,7 @@ 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

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

@@ -19,6 +19,7 @@ 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

sql/sql_base.cc

@@ -1548,6 +1548,7 @@ void close_temporary_tables(THD *thd)
                             s_query.length() - 1 /* to remove trailing ',' */,
                             0, FALSE, 0);
       qinfo.db= db.ptr();
+      qinfo.db_len= db.length();
       thd->variables.character_set_client= cs_save;
       mysql_bin_log.write(&qinfo);
       thd->variables.pseudo_thread_id= save_pseudo_thread_id;