bk commit into 5.1 tree (cps:1.2072)

[Petr Chardin]

Below is the list of changes that have just been committed into a local
5.1 repository of cps. When cps 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
  1.2072 06/01/18 14:16:52 cps@stripped +2 -0
  Merge outpost.site:/home/cps/mysql/trees/5.1/5.1-virgin-debug
  into  outpost.site:/home/cps/mysql/devel/mysql-5.1-logs-merge

  sql/sql_table.cc
    1.284 06/01/18 14:16:47 cps@stripped +0 -0
    Auto merged

  sql/mysql_priv.h
    1.360 06/01/18 14:16:47 cps@stripped +0 -0
    Auto merged

# 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:	cps
# Host:	outpost.site
# Root:	/home/cps/mysql/devel/mysql-5.1-logs-merge/RESYNC

--- 1.359/sql/mysql_priv.h	2006-01-18 12:07:26 +03:00
+++ 1.360/sql/mysql_priv.h	2006-01-18 14:16:47 +03:00
@@ -897,7 +897,7 @@
 
 /* information schema */
 extern LEX_STRING information_schema_name;
-const extern LEX_STRING partition_keywords[];
+extern const LEX_STRING partition_keywords[];
 LEX_STRING *make_lex_string(THD *thd, LEX_STRING *lex_str,
                             const char* str, uint length,
                             bool allocate_lex_string);

--- 1.283/sql/sql_table.cc	2006-01-18 12:07:27 +03:00
+++ 1.284/sql/sql_table.cc	2006-01-18 14:16:47 +03:00
@@ -3844,6 +3844,7 @@
   uint *index_drop_buffer;
   uint index_add_count;
   uint *index_add_buffer;
+  bool committed= 0;
   DBUG_ENTER("mysql_alter_table");
 
   thd->proc_info="init";
@@ -4761,6 +4762,7 @@
       DBUG_PRINT("info", ("Committing after add/drop index"));
       if (ha_commit_stmt(thd) || ha_commit(thd))
         goto err;
+      committed= 1;
     }
   }
   /*end of if (! new_table) for add/drop index*/
@@ -4892,7 +4894,6 @@
     VOID(pthread_mutex_unlock(&LOCK_open));
     goto err;
   }
-#ifdef XXX_TO_BE_DONE_LATER_BY_WL1892
   if (! need_copy_table)
   {
     if (! table)
@@ -4909,7 +4910,6 @@
       goto err;
     }
   }
-#endif
   if (thd->lock || new_name != table_name)	// True if WIN32
   {
     /*
@@ -4959,11 +4959,14 @@
     wait_if_global_read_lock(), which could create a deadlock if called
     with LOCK_open.
   */
-  error = ha_commit_stmt(thd);
-  if (ha_commit(thd))
-    error=1;
-  if (error)
-    goto err;
+  if (!committed)
+  {
+    error = ha_commit_stmt(thd);
+    if (ha_commit(thd))
+      error=1;
+    if (error)
+      goto err;
+  }
   thd->proc_info="end";
 
   DBUG_ASSERT(!(mysql_bin_log.is_open() && binlog_row_based &&