bzr push into mysql-trunk branch (Dmitry.Shulga:3113 to 3114) Bug#11749345

[Dmitry Shulga]

 3114 Dmitry Shulga	2011-05-25 [merge]
      Merge mysql-5.5->mysql-trunk for follow-up for bug#11749345.

    modified:
      sql/sql_show.cc
 3113 Anitha Gopi	2011-05-25 [merge]
      Automerge from 5.5

    modified:
      mysql-test/t/disabled.def
=== modified file 'sql/sql_show.cc'
--- a/sql/sql_show.cc	2011-05-21 09:31:19 +0000
+++ b/sql/sql_show.cc	2011-05-25 16:48:28 +0000
@@ -3773,6 +3773,8 @@ int get_all_tables(THD *thd, TABLE_LIST 
                 continue;
             }
 
+            DEBUG_SYNC(thd, "before_open_in_get_all_tables");
+
             if (fill_schema_table_by_open(thd, FALSE,
                                           table, schema_table,
                                           db_name, table_name,


Attachment: [text/bzr-bundle] bzr/[e-mail]