bzr push into mysql-5.5 branch (sneha.modi:3604 to 3605) Bug#11748731

[Sneha Modi]

 3605 Sneha Modi	2011-11-11
      BUG#11748731 - 37248: SOME 'BIG' TESTS FAILING ON 6.0 :
      
      A change has been made in the sql/sql_table.cc file to include debug_sync.

    modified:
      sql/sql_table.cc
 3604 Marko Mäkelä	2011-11-10 [merge]
      Merge mysql-5.1 to mysql-5.5.

    modified:
      mysql-test/suite/innodb/r/innodb-lock.result
      mysql-test/suite/innodb/t/innodb-lock.test
=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2011-11-01 06:52:04 +0000
+++ b/sql/sql_table.cc	2011-11-11 09:23:50 +0000
@@ -5958,6 +5958,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).