From: Dmitry Shulga
Date: May 25 2011 5:04pm
Subject: bzr push into mysql-trunk branch (Dmitry.Shulga:3113 to 3114) Bug#11749345
List-Archive: http://lists.mysql.com/commits/138121
X-Bug: 11749345
Message-Id: <201105251705.p4PH5NkY014400@acsmt356.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1082368636167528939=="

--===============1082368636167528939==
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

 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,


--===============1082368636167528939==
MIME-Version: 1.0
Content-Type: text/bzr-bundle; charset="us-ascii";
	name="bzr/dmitry.shulga@stripped"
Content-Transfer-Encoding: 7bit
Content-Disposition: inline

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: dmitry.shulga@stripped\
#   h71zhjn7nj07jn7g
# target_branch: file:///Users/shulga/projects/mysql/mysql-trunk/
# testament_sha1: 082f70e656bda23d8a80366c69fd290c2fd9b5cd
# timestamp: 2011-05-26 00:05:16 +0700
# source_branch: file:///Users/shulga/projects/mysql/mysql-5.5/
# base_revision_id: anitha.gopi@stripped\
#   75k9hoorn1p18xfx
# 
# Begin bundle
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
/8XckU4UJB//RMbA


--===============1082368636167528939==--