bk commit into 5.1 tree (mats:1.2584)

[Mats Kindahl]

Below is the list of changes that have just been committed into a local
5.1 repository of mats. When mats does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-31 12:41:58+02:00, mats@stripped +2 -0
  WL#3303 (RBR: Engine-controlled logging format):
  
  Minor changes to eliminate the select_create::select_tables member
  variable.

  sql/sql_class.h@stripped, 2007-05-31 12:41:52+02:00, mats@stripped +3 -3
    Removing select_create::select_tables variable and using
    select_insert::table_list instead since they have the same purpose.

  sql/sql_insert.cc@stripped, 2007-05-31 12:41:52+02:00, mats@stripped +5 -1
    Using table_list instead of select_tables.

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	mats
# Host:	kindahl-laptop.dnsalias.net
# Root:	/home/bk/w3303-mysql-5.1-rpl

--- 1.356/sql/sql_class.h	2007-05-31 12:42:08 +02:00
+++ 1.357/sql/sql_class.h	2007-05-31 12:42:08 +02:00
@@ -1921,7 +1921,6 @@
 class select_create: public select_insert {
   ORDER *group;
   TABLE_LIST *create_table;
-  TABLE_LIST *select_tables;
   List<create_field> *extra_fields;
   List<Key> *keys;
   HA_CREATE_INFO *create_info;
@@ -1933,9 +1932,10 @@
 		 List<Key> &keys_par,
 		 List<Item> &select_fields,enum_duplicates duplic, bool ignore,
                  TABLE_LIST *select_tables_arg)
-    :select_insert (NULL, NULL, &select_fields, 0, 0, duplic, ignore),
+    :select_insert (select_tables_arg, NULL, &select_fields, 0, 0,
+                    duplic, ignore),
     create_table(table_arg), extra_fields(&fields_par),keys(&keys_par),
-    create_info(create_info_par), select_tables(select_tables_arg)
+    create_info(create_info_par)
     {}
   int prepare(List<Item> &list, SELECT_LEX_UNIT *u);
 

--- 1.263/sql/sql_insert.cc	2007-05-31 12:42:08 +02:00
+++ 1.264/sql/sql_insert.cc	2007-05-31 12:42:08 +02:00
@@ -3150,6 +3150,10 @@
     statement, there is no way to lock the table for accesses on the
     slave.  Hence, we have to hold on to the CREATE part of the
     statement until the statement has finished.
+
+    It is necessary to work with a copy of the
+    <code>create_table</code> since the supplied pointer is used
+    elsewhere and should not be linked into another list.
    */
   class MY_HOOKS : public TABLEOP_HOOKS {
   public:
@@ -3181,7 +3185,7 @@
     TABLE_LIST all_tables;
   };
 
-  MY_HOOKS hooks(this, create_table, select_tables);
+  MY_HOOKS hooks(this, create_table, table_list);
   hook_ptr= &hooks;
 
   unit= u;