From: Jon Olav Hauglid
Date: October 5 2011 1:57pm
Subject: bzr push into mysql-trunk-wl5534 branch (jon.hauglid:3401 to 3402) WL#5534
List-Archive: http://lists.mysql.com/commits/141299
Message-Id: <201110051357.p95DvxYV009472@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3402 Jon Olav Hauglid	2011-10-05
      WL#5534 Online ALTER, Phase 1.
        
      Patch #30:
      - Move debug sync point from default implementation of new
        online alter api to server code. This makes it independent
        on storage engines.

    modified:
      sql/handler.cc
      sql/sql_table.cc
 3401 Jon Olav Hauglid	2011-10-05
      WL#5534 Online ALTER, Phase 1.
        
      Patch #29:
      - Don't promote unique keys to primary keys if the index
        contains column prefixes. Update the ALTER TABLE logic
        to match logic already present in open_binary_frm().

    modified:
      sql/sql_table.cc
=== modified file 'sql/handler.cc'
--- a/sql/handler.cc	2011-10-03 14:04:05 +0000
+++ b/sql/handler.cc	2011-10-05 13:57:08 +0000
@@ -4013,11 +4013,6 @@ bool handler::commit_inplace_alter_table
   if (ha_alter_info->pending_add_index)
   {
     ha_alter_info->pending_add_index= false;
-    DBUG_EXECUTE_IF("alter_table_rollback_new_index", {
-      final_add_index(ha_alter_info->handler_ctx, false);
-      my_error(ER_UNKNOWN_ERROR, MYF(0));
-      DBUG_RETURN(true);
-    });
     if ((error= final_add_index(ha_alter_info->handler_ctx, commit)))
     {
       print_error(error, MYF(0));

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2011-10-05 13:02:47 +0000
+++ b/sql/sql_table.cc	2011-10-05 13:57:08 +0000
@@ -6193,6 +6193,15 @@ static bool mysql_inplace_alter_table(TH
   if (wait_while_table_is_used(thd, table, HA_EXTRA_PREPARE_FOR_RENAME))
     goto err;
 
+  DBUG_EXECUTE_IF("alter_table_rollback_new_index", {
+      table->file->commit_inplace_alter_table(create_info,
+                                              ha_alter_info,
+                                              ha_alter_flags,
+                                              false);
+      my_error(ER_UNKNOWN_ERROR, MYF(0));
+      DBUG_RETURN(true);
+    });
+
   if (table->file->commit_inplace_alter_table(create_info,
                                               ha_alter_info,
                                               ha_alter_flags,

No bundle (reason: useless for push emails).