bk commit into 5.1 tree (ingo:1.2334) BUG#18129

[ingo]

Below is the list of changes that have just been committed into a local
5.1 repository of mydev. When mydev 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.2334 06/04/13 16:19:19 ingo@stripped +1 -0
  Bug#18129 - Fast (online) add index leaves temporary table frm in case of errors
  
  ALTER TABLE temporarily creates a new table with a .frm
  file and optionally other files. For fast ALTER TABLE
  only the .frm file is created. If the operation succeeds,
  The temporary files are renamed to their final target.
  
  In case of an error, the temporary file was forgotten to
  remove.
  
  Manually tested. The test requires to look at files,
  which I think cannot be done portably with the test suite.
  The test file is attached to the bug report.

  sql/sql_table.cc
    1.325 06/04/13 16:19:11 ingo@stripped +18 -31
    Bug#18129 - Fast (online) add index leaves temporary table frm in case of errors
    Moved closing or removing of the temporary table
    to an 'err1' label at the end of mysql_alter_table().
    Added gotos to this label from all error checks between
    create or open and remove or close of the temporary table.

# 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:	ingo
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.1-bug18129

--- 1.324/sql/sql_table.cc	2006-04-11 14:06:15 +02:00
+++ 1.325/sql/sql_table.cc	2006-04-13 16:19:11 +02:00
@@ -4738,10 +4738,7 @@
       new_table=open_temporary_table(thd, path, new_db, tmp_name,0);
     }
     if (!new_table)
-    {
-      VOID(quick_rm_table(new_db_type,new_db,tmp_name));
-      goto err;
-    }
+      goto err1;
   }
 
   /* Copy the data if necessary. */
@@ -4794,7 +4791,7 @@
               table->file->create_handler_files(path, create_info));
       VOID(pthread_mutex_unlock(&LOCK_open));
       if (error)
-        goto err;
+        goto err1;
 #endif
 
       /* The add_index() method takes an array of KEY structs. */
@@ -4822,7 +4819,7 @@
         table->key_info= key_info;
         table->file->print_error(error, MYF(0));
         table->key_info= save_key_info;
-        goto err;
+        goto err1;
       }
     }
     /*end of if (index_add_count)*/
@@ -4840,7 +4837,7 @@
               table->file->create_handler_files(path, create_info));
       VOID(pthread_mutex_unlock(&LOCK_open));
       if (error)
-        goto err;
+        goto err1;
 
       if (! need_lock_for_indexes)
       {
@@ -4874,7 +4871,7 @@
                                                   index_drop_count)))
       {
         table->file->print_error(error, MYF(0));
-        goto err;
+        goto err1;
       }
 
 #ifdef XXX_TO_BE_DONE_LATER_BY_WL3020
@@ -4902,7 +4899,7 @@
       if ((error= table->file->final_drop_index(table)))
       {
         table->file->print_error(error, MYF(0));
-        goto err;
+        goto err1;
       }
     }
     /*end of if (index_drop_count)*/
@@ -4915,7 +4912,7 @@
     /* Need to commit before a table is unlocked (NDB requirement). */
     DBUG_PRINT("info", ("Committing before unlocking table"));
     if (ha_commit_stmt(thd) || ha_commit(thd))
-      goto err;
+      goto err1;
     committed= 1;
   }
   /*end of if (! new_table) for add/drop index*/
@@ -4924,17 +4921,7 @@
   {
     /* We changed a temporary table */
     if (error)
-    {
-      /*
-	The following function call will free the new_table pointer,
-	in close_temporary_table(), so we can safely directly jump to err
-      */
-      if (new_table)
-        close_temporary_table(thd, new_table, 1, 1);
-      else
-        VOID(quick_rm_table(new_db_type,new_db,tmp_name));
-      goto err;
-    }
+      goto err1;
     /* Close lock if this is a transactional table */
     if (thd->lock)
     {
@@ -4945,16 +4932,7 @@
     close_temporary_table(thd, table, 1, 1);
     /* Should pass the 'new_name' as we store table name in the cache */
     if (rename_temporary_table(thd, new_table, new_db, new_name))
-    {						// Fatal error
-      if (new_table)
-      {
-        close_temporary_table(thd, new_table, 1, 1);
-        my_free((gptr) new_table,MYF(0));
-      }
-      else
-        VOID(quick_rm_table(new_db_type,new_db,tmp_name));
-      goto err;
-    }
+      goto err1;
     /* We don't replicate alter table statement on temporary tables */
     if (!thd->current_stmt_binlog_row_based)
       write_bin_log(thd, TRUE, thd->query, thd->query_length);
@@ -5168,6 +5146,15 @@
     send_ok(thd,copied+deleted,0L,tmp_name);
   thd->some_tables_deleted=0;
   DBUG_RETURN(FALSE);
+
+ err1:
+  if (new_table)
+  {
+    /* close_temporary_table() frees the new_table pointer. */
+    close_temporary_table(thd, new_table, 1, 1);
+  }
+  else
+    VOID(quick_rm_table(new_db_type,new_db,tmp_name));
 
  err:
   DBUG_RETURN(TRUE);