bzr commit into mysql-6.0 branch (mats:2857) Bug#34707

[Mats Kindahl]

#At file:///home/bzr/merges/merge-6.0-5.1.29-rc/

 2857 Mats Kindahl	2008-10-08 [merge]
      Merging 5.1-5.1.29-rc with BUG#34707 into 6.0-5.1.29-rc.
modified:
  mysql-test/suite/rpl/r/rpl_row_create_table.result
  mysql-test/suite/rpl/t/rpl_row_create_table.test
  sql/handler.cc
  sql/log.cc
  sql/sql_class.cc
  sql/sql_class.h
  sql/sql_insert.cc
  sql/sql_parse.cc
  sql/sql_show.cc
  sql/sql_show.h
  sql/sql_table.cc

=== modified file 'mysql-test/suite/rpl/r/rpl_row_create_table.result'
--- a/mysql-test/suite/rpl/r/rpl_row_create_table.result	2008-05-01 09:34:54 +0000
+++ b/mysql-test/suite/rpl/r/rpl_row_create_table.result	2008-10-08 09:19:27 +0000
@@ -430,4 +430,25 @@ a
 1
 2
 DROP TABLE t1;
+stop slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+reset master;
+reset slave;
+drop table if exists t1,t2,t3,t4,t5,t6,t7,t8,t9;
+start slave;
+CREATE DATABASE mysqltest1;
+CREATE TABLE mysqltest1.without_select (f1 BIGINT);
+CREATE TABLE mysqltest1.with_select AS SELECT 1 AS f1;
+show binlog events from <binlog_start>;
+Log_name	Pos	Event_type	Server_id	End_log_pos	Info
+master-bin.000001	#	Query	#	#	CREATE DATABASE mysqltest1
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE mysqltest1.without_select (f1
BIGINT)
+master-bin.000001	#	Query	#	#	use `test`; BEGIN
+master-bin.000001	#	Query	#	#	use `test`; CREATE TABLE `mysqltest1`.`with_select` (
+  `f1` int(1) NOT NULL DEFAULT '0'
+)
+master-bin.000001	#	Table_map	#	#	table_id: # (mysqltest1.with_select)
+master-bin.000001	#	Write_rows	#	#	table_id: # flags: STMT_END_F
+master-bin.000001	#	Query	#	#	use `test`; COMMIT
+DROP DATABASE mysqltest1;
 end of the tests

=== modified file 'mysql-test/suite/rpl/t/rpl_row_create_table.test'
--- a/mysql-test/suite/rpl/t/rpl_row_create_table.test	2008-04-29 04:37:22 +0000
+++ b/mysql-test/suite/rpl/t/rpl_row_create_table.test	2008-10-08 09:19:27 +0000
@@ -259,5 +259,22 @@ connection master;
 DROP TABLE t1;
 sync_slave_with_master;
 
+#
+# BUG#34707: Row based replication: slave creates table within wrong database
+#
+
+source include/master-slave-reset.inc;
+
+connection master;
+CREATE DATABASE mysqltest1;
+
+CREATE TABLE mysqltest1.without_select (f1 BIGINT);
+CREATE TABLE mysqltest1.with_select AS SELECT 1 AS f1;
+source include/show_binlog_events.inc;
+sync_slave_with_master;
+
+connection master;
+DROP DATABASE mysqltest1;
+sync_slave_with_master;
 
 --echo end of the tests

=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2008-10-06 17:04:15 +0000
+++ b/sql/handler.cc	2008-10-08 09:19:27 +0000
@@ -5104,6 +5104,8 @@ static int write_locked_table_maps(THD *
   DBUG_PRINT("enter", ("thd: %p  thd->lock: %p thd->extra_lock: %p",
                        thd, thd->lock, thd->extra_lock));
 
+  DBUG_PRINT("debug", ("get_binlog_table_maps(): %d", thd->get_binlog_table_maps()));
+
   if (thd->get_binlog_table_maps() == 0)
   {
     MYSQL_LOCK *locks[2];

=== modified file 'sql/log.cc'
--- a/sql/log.cc	2008-10-06 17:04:15 +0000
+++ b/sql/log.cc	2008-10-08 09:19:27 +0000
@@ -2121,6 +2121,8 @@ binlog_end_trans(THD *thd, binlog_trx_da
                       FLAGSTR(thd->options, OPTION_NOT_AUTOCOMMIT),
                       FLAGSTR(thd->options, OPTION_BEGIN)));
 
+  thd->binlog_flush_pending_rows_event(TRUE);
+
   /*
     NULL denotes ROLLBACK with nothing to replicate: i.e., rollback of
     only transactional tables.  If the transaction contain changes to
@@ -2139,8 +2141,6 @@ binlog_end_trans(THD *thd, binlog_trx_da
       were, we would have to ensure that we're not ending a statement
       inside a stored function.
      */
-    thd->binlog_flush_pending_rows_event(TRUE);
-
     error= mysql_bin_log.write(thd, &trx_data->trans_log, end_ev);
     trx_data->reset();
 

=== modified file 'sql/sql_class.cc'
--- a/sql/sql_class.cc	2008-10-01 12:02:28 +0000
+++ b/sql/sql_class.cc	2008-10-08 09:19:27 +0000
@@ -3562,6 +3562,24 @@ int THD::binlog_flush_pending_rows_event
 }
 
 
+static const char *
+show_query_type(THD::enum_binlog_query_type qtype)
+{
+  switch (qtype) {
+  case THD::ROW_QUERY_TYPE:
+    return "ROW";
+  case THD::STMT_QUERY_TYPE:
+    return "STMT";
+  case THD::MYSQL_QUERY_TYPE:
+    return "MYSQL";
+  }
+
+  static char buf[64];
+  sprintf(buf, "UNKNOWN#%d", qtype);
+  return buf;
+}
+
+
 /*
   Member function that will log query, either row-based or
   statement-based depending on the value of the 'current_stmt_binlog_row_based'
@@ -3590,7 +3608,8 @@ int THD::binlog_query(THD::enum_binlog_q
                       THD::killed_state killed_status_arg)
 {
   DBUG_ENTER("THD::binlog_query");
-  DBUG_PRINT("enter", ("qtype: %d  query: '%s'", qtype, query_arg));
+  DBUG_PRINT("enter", ("qtype: %s  query: '%s'",
+                       show_query_type(qtype), query_arg));
   DBUG_ASSERT(query_arg && mysql_bin_log.is_open());
 
   /*
@@ -3629,6 +3648,9 @@ int THD::binlog_query(THD::enum_binlog_q
 
   switch (qtype) {
   case THD::ROW_QUERY_TYPE:
+    DBUG_PRINT("debug",
+               ("current_stmt_binlog_row_based: %d",
+                current_stmt_binlog_row_based));
     if (current_stmt_binlog_row_based)
       DBUG_RETURN(0);
     /* Otherwise, we fall through */

=== modified file 'sql/sql_class.h'
--- a/sql/sql_class.h	2008-10-06 17:04:15 +0000
+++ b/sql/sql_class.h	2008-10-08 09:19:27 +0000
@@ -1070,6 +1070,21 @@ enum enum_thread_type
   SYSTEM_THREAD_BACKUP= 64
 };
 
+inline char const *
+show_system_thread(enum_thread_type thread)
+{
+#define RETURN_NAME_AS_STRING(NAME) case (NAME): return #NAME
+  switch (thread) {
+    RETURN_NAME_AS_STRING(NON_SYSTEM_THREAD);
+    RETURN_NAME_AS_STRING(SYSTEM_THREAD_DELAYED_INSERT);
+    RETURN_NAME_AS_STRING(SYSTEM_THREAD_SLAVE_IO);
+    RETURN_NAME_AS_STRING(SYSTEM_THREAD_SLAVE_SQL);
+    RETURN_NAME_AS_STRING(SYSTEM_THREAD_NDBCLUSTER_BINLOG);
+    RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_SCHEDULER);
+    RETURN_NAME_AS_STRING(SYSTEM_THREAD_EVENT_WORKER);
+  }
+#undef RETURN_NAME_AS_STRING
+}
 
 /**
   This class represents the interface for internal error handlers.
@@ -2270,6 +2285,10 @@ public:
 
       Don't reset binlog format for NDB binlog injector thread.
     */
+    DBUG_PRINT("debug",
+               ("temporary_tables: %d, in_sub_stmt: %d, system_thread: %s",
+                (int) temporary_tables, in_sub_stmt,
+                show_system_thread(system_thread)));
     if ((temporary_tables == NULL) && (in_sub_stmt == 0) &&
         (system_thread != SYSTEM_THREAD_NDBCLUSTER_BINLOG))
     {

=== modified file 'sql/sql_insert.cc'
--- a/sql/sql_insert.cc	2008-10-01 12:02:28 +0000
+++ b/sql/sql_insert.cc	2008-10-08 09:19:27 +0000
@@ -3719,7 +3719,8 @@ select_create::binlog_show_create_table(
   tmp_table_list.table = *tables;
   query.length(0);      // Have to zero it since constructor doesn't
 
-  result= store_create_info(thd, &tmp_table_list, &query, create_info);
+  result= store_create_info(thd, &tmp_table_list, &query, create_info,
+                            /* show_database */ TRUE);
   DBUG_ASSERT(result == 0); /* store_create_info() always return 0 */
 
   if (mysql_bin_log.is_open())

=== modified file 'sql/sql_parse.cc'
--- a/sql/sql_parse.cc	2008-10-01 12:02:28 +0000
+++ b/sql/sql_parse.cc	2008-10-08 09:19:27 +0000
@@ -5347,6 +5347,10 @@ void mysql_reset_thd_for_next_command(TH
   */
   thd->reset_current_stmt_binlog_row_based();
 
+  DBUG_PRINT("debug",
+             ("current_stmt_binlog_row_based: %d",
+              thd->current_stmt_binlog_row_based));
+
   DBUG_VOID_RETURN;
 }
 

=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2008-09-25 07:15:02 +0000
+++ b/sql/sql_show.cc	2008-10-08 09:19:27 +0000
@@ -541,7 +541,8 @@ mysqld_show_create(THD *thd, TABLE_LIST 
 
   if ((table_list->view ?
        view_store_create_info(thd, table_list, &buffer) :
-       store_create_info(thd, table_list, &buffer, NULL)))
+       store_create_info(thd, table_list, &buffer, NULL,
+                         FALSE /* show_database */)))
     DBUG_RETURN(TRUE);
 
   List<Item> field_list;
@@ -698,6 +699,8 @@ mysqld_list_fields(THD *thd, TABLE_LIST 
 }
 
 
+  if (store_create_info(thd, table_list, packet, NULL,
+                        FALSE /* show_database */))
 /*
   Go through all character combinations and ensure that sql_lex.cc can
   parse it as an identifier.
@@ -932,7 +935,7 @@ static bool get_field_default_value(THD 
  */
 
 int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
-                      HA_CREATE_INFO *create_info_arg)
+                      HA_CREATE_INFO *create_info_arg, bool show_database)
 {
   List<Item> field_list;
   char tmp[MAX_FIELD_WIDTH], *for_str, buff[128], def_value_buf[MAX_FIELD_WIDTH];
@@ -980,6 +983,25 @@ int store_create_info(THD *thd, TABLE_LI
       alias= share->table_name.str;
     }
   }
+
+  /*
+    Print the database before the table name if told to do that. The
+    database name is only printed in the event that it is different
+    from the current database.  The main reason for doing this is to
+    avoid having to update gazillions of tests and result files, but
+    it also saves a few bytes of the binary log.
+   */
+  if (show_database)
+  {
+    const LEX_STRING *const db=
+      table_list->schema_table ? &INFORMATION_SCHEMA_NAME :
&table->s->db;
+    if (strcmp(db->str, thd->db) != 0)
+    {
+      append_identifier(thd, packet, db->str, db->length);
+      packet->append(STRING_WITH_LEN("."));
+    }
+  }
+
   append_identifier(thd, packet, alias, strlen(alias));
   packet->append(STRING_WITH_LEN(" (\n"));
   /*

=== modified file 'sql/sql_show.h'
--- a/sql/sql_show.h	2008-01-14 19:49:27 +0000
+++ b/sql/sql_show.h	2008-10-08 09:19:27 +0000
@@ -33,7 +33,7 @@ find_files_result find_files(THD *thd, L
                              const char *path, const char *wild, bool dir);
 
 int store_create_info(THD *thd, TABLE_LIST *table_list, String *packet,
-                      HA_CREATE_INFO  *create_info_arg);
+                      HA_CREATE_INFO  *create_info_arg, bool show_database);
 bool store_db_create_info(THD *thd, const char *dbname, String *buffer,
                           HA_CREATE_INFO *create_info);
 int view_store_create_info(THD *thd, TABLE_LIST *table, String *buff);

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2008-10-01 12:02:28 +0000
+++ b/sql/sql_table.cc	2008-10-08 09:19:27 +0000
@@ -4983,8 +4983,9 @@ bool mysql_create_like_table(THD* thd, T
                        MYSQL_OPEN_REOPEN))
           goto err;
 
-        IF_DBUG(int result=) store_create_info(thd, table, &query,
-                                               create_info);
+        IF_DBUG(int result=)
+          store_create_info(thd, table, &query,
+                            create_info, FALSE /* show_database */);
 
         DBUG_ASSERT(result == 0); // store_create_info() always return 0
         write_bin_log(thd, TRUE, query.ptr(), query.length());