bk commit into 5.0 tree (kroki:1.2295)

[kroki]

Below is the list of changes that have just been committed into a local
5.0 repository of tomash. When tomash 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, 2006-10-27 16:16:19+04:00, kroki@stripped +3 -0
  Merge moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0
  into  moonlight.intranet:/home/tomash/src/mysql_ab/mysql-5.0-bug19182
  MERGE: 1.2290.2.2

  sql/sql_insert.cc@stripped, 2006-10-27 16:16:13+04:00, kroki@stripped +0 -0
    Auto merged
    MERGE: 1.203.1.3

  sql/sql_parse.cc@stripped, 2006-10-27 16:16:13+04:00, kroki@stripped +0 -0
    Auto merged
    MERGE: 1.584.1.1

  sql/sql_table.cc@stripped, 2006-10-27 16:16:13+04:00, kroki@stripped +0 -0
    Auto merged
    MERGE: 1.322.1.1

# 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:	kroki
# Host:	moonlight.intranet
# Root:	/home/tomash/src/mysql_ab/mysql-5.0-bug19182/RESYNC

--- 1.206/sql/sql_insert.cc	2006-10-27 16:16:28 +04:00
+++ 1.207/sql/sql_insert.cc	2006-10-27 16:16:28 +04:00
@@ -2660,6 +2660,12 @@ static TABLE *create_table_from_items(TH
   bool not_used;
   DBUG_ENTER("create_table_from_items");
 
+  /*
+    Remember last node so we will be able to chop any elements added
+    later to restore the list to its original state.
+  */
+  list_node **remember_last_node= extra_fields->plast_node();
+
   tmp_table.alias= 0;
   tmp_table.timestamp_field= 0;
   tmp_table.s= &tmp_table.share_not_to_be_used;
@@ -2730,6 +2736,12 @@ static TABLE *create_table_from_items(TH
         quick_rm_table(create_info->db_type, create_table->db,
                        table_case_name(create_info, create_table->table_name));
     }
+
+    /*
+      Chop off extra fields added before the call to mysql_create_table().
+    */
+    extra_fields->remove_after(remember_last_node);
+
     reenable_binlog(thd);
     if (!table)                                   // open failed
       DBUG_RETURN(0);

--- 1.585/sql/sql_parse.cc	2006-10-27 16:16:28 +04:00
+++ 1.586/sql/sql_parse.cc	2006-10-27 16:16:28 +04:00
@@ -2969,9 +2969,6 @@ mysql_execute_command(THD *thd)
           res= handle_select(thd, lex, result, 0);
           delete result;
         }
-	/* reset for PS */
-	lex->create_list.empty();
-	lex->key_list.empty();
       }
     }
     else