From: Sneha Modi
Date: November 11 2011 9:28am
Subject: bzr push into mysql-trunk branch (sneha.modi:3596 to 3597) Bug#11748731
List-Archive: http://lists.mysql.com/commits/141902
X-Bug: 11748731
Message-Id: <201111110928.pAB9S7JP011222@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3597 Sneha Modi	2011-11-11 [merge]
      BUG#11748731 - 37248: SOME 'BIG' TESTS FAILING ON 6.0 :
      
      Merging from mysql-5.5 -> mysql-trunk

    modified:
      sql/sql_table.cc
 3596 Jon Olav Hauglid	2011-11-11
      BUG#11761014 - 53466: END_CONNECTION() SHOULD REFERENCE
                     GLOBAL_SYSTEM_VARIABLES.LOG_WARNINGS 
      
      Post-push fix: Update result file for 32 bit version
      og log_warnings test.

    modified:
      mysql-test/suite/sys_vars/r/log_warnings_basic_32.result
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2011-11-03 16:03:34 +0000
+++ b/sql/sql_table.cc	2011-11-11 09:25:18 +0000
@@ -6263,6 +6263,7 @@ bool mysql_alter_table(THD *thd,char *ne
     case ENABLE:
       if (wait_while_table_is_used(thd, table, HA_EXTRA_FORCE_REOPEN))
         goto err;
+      DEBUG_SYNC(thd,"alter_table_enable_indexes");
       DBUG_EXECUTE_IF("sleep_alter_enable_indexes", my_sleep(6000000););
       error= table->file->ha_enable_indexes(HA_KEY_SWITCH_NONUNIQ_SAVE);
       break;

No bundle (reason: useless for push emails).