From: Jon Olav Hauglid
Date: August 20 2010 7:34am
Subject: bzr push into mysql-5.5-bugfixing branch (jon.hauglid:3113 to 3114) Bug#55973
List-Archive: http://lists.mysql.com/commits/116335
X-Bug: 55973
Message-Id: <201008200734.o7K5b7JG031425@acsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5978729774061650382=="

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

 3114 Jon Olav Hauglid	2010-08-20
      Bug #55973 Assertion `thd->transaction.stmt.is_empty()'
                 on CREATE TABLE .. SELECT I_S.PART
      
      This assert was triggered if an InnoDB table was created using
      CREATE TABLE ... AS SELECT where the query used an I_S table, and
      a view existed in the database. It would also be triggered for
      any statement changing an InnoDB table (e.g. INSERT, UPDATE, DELETE)
      which had a subquery referencing an I_S table.
      
      The assert was triggered if open_normal_and_derived_tables() failed
      and a statement transaction had been started. This will usually not
      happen as tables are opened before a statement transaction is started.
      However, e.g. CREATE TABLE ... AS SELECT starts a transaction in order
      to insert tuples into the new table. And if the subquery references
      an I_S table, all current tables and views can be opened in order to
      fill the I_S table on the fly. If a view is discovered, open will fail
      as it is instructed to open tables only (OPEN_TABLE_ONLY). This would
      cause the assert to be triggered.
      
      The assert was added in the patch for Bug#52044 and was therefore
      not in any released versions of the server.
      
      This patch fixes the problem by adjusting the assert to take into
      consideration the possibility of tables being opened as part of
      an I_S query. This is similar to what is already done for 
      close_tables_for_reopen().
      
      Test case added to information_schema_inno.test.

    modified:
      mysql-test/r/information_schema_inno.result
      mysql-test/t/information_schema_inno.test
      sql/sql_base.cc
 3113 Jon Olav Hauglid	2010-08-19
      Bug #56085 Embedded server tests fails with assert in
                 check_if_table_exists()
      
      This assert was triggered when the server tried to load plugins
      while running in embedded server mode. In embedded server mode,
      check_if_table_exists() was used to check if mysql.plugin existed
      so that ER_NO_SUCH_TABLE could be silently ignored.
      The problem was that this check was done without acquiring a metadata
      lock on mysql.plugin first. This triggered the assert.
      
      This patch fixes the problem by removing the call to
      check_if_table_exists() from plugin_load(). Instead an error handler
      which traps ER_NO_SUCH_TABLE is installed before trying to open
      mysql.plugin when running in embedded server mode.
      
      No test coverage added since this assert was triggered by 
      existing tests running in embedded server mode.
     @ sql/sql_base.cc
        Renamed Prelock_error_handler to No_such_table_error_handler
        and moved the declaration to sql_base.h to make it usable
        in plugin_load().
     @ sql/sql_base.h
        Renamed Prelock_error_handler to No_such_table_error_handler
        and moved the declaration to sql_base.h to make it usable
        in plugin_load().
     @ sql/sql_plugin.cc
        Removed call to check_if_table_exists() used to check for mysql.plugin 
        in plugin_load() for embedded server. Instead install error handler
        which traps ER_NO_SUCH_TABLE during open_and_lock_tables().

    modified:
      sql/sql_base.cc
      sql/sql_base.h
      sql/sql_plugin.cc
=== modified file 'mysql-test/r/information_schema_inno.result'
--- a/mysql-test/r/information_schema_inno.result	2009-10-23 11:02:20 +0000
+++ b/mysql-test/r/information_schema_inno.result	2010-08-20 07:16:26 +0000
@@ -89,3 +89,15 @@ UNIQUE_CONSTRAINT_NAME
 NULL
 drop table t2;
 set foreign_key_checks = 1;
+#
+# Bug#55973 Assertion `thd->transaction.stmt.is_empty()'
+#           on CREATE TABLE .. SELECT I_S.PART
+#
+DROP TABLE IF EXISTS t1;
+DROP VIEW IF EXISTS v1;
+CREATE VIEW v1 AS SELECT 1;
+CREATE TABLE t1 engine = InnoDB AS
+SELECT * FROM information_schema.partitions
+WHERE table_schema= 'test' AND table_name= 'v1';
+DROP TABLE t1;
+DROP VIEW v1;

=== modified file 'mysql-test/t/information_schema_inno.test'
--- a/mysql-test/t/information_schema_inno.test	2008-03-14 10:12:39 +0000
+++ b/mysql-test/t/information_schema_inno.test	2010-08-20 07:16:26 +0000
@@ -89,3 +89,23 @@ from information_schema.referential_cons
 where constraint_schema = schema();
 drop table t2;
 set foreign_key_checks = 1;
+
+
+--echo #
+--echo # Bug#55973 Assertion `thd->transaction.stmt.is_empty()'
+--echo #           on CREATE TABLE .. SELECT I_S.PART
+--echo #
+
+--disable_warnings
+DROP TABLE IF EXISTS t1;
+DROP VIEW IF EXISTS v1;
+--enable_warnings
+
+CREATE VIEW v1 AS SELECT 1;
+# This used to case an assert.
+CREATE TABLE t1 engine = InnoDB AS
+  SELECT * FROM information_schema.partitions
+  WHERE table_schema= 'test' AND table_name= 'v1';
+
+DROP TABLE t1;
+DROP VIEW v1;

=== modified file 'sql/sql_base.cc'
--- a/sql/sql_base.cc	2010-08-19 09:33:37 +0000
+++ b/sql/sql_base.cc	2010-08-20 07:16:26 +0000
@@ -5411,8 +5411,14 @@ bool open_normal_and_derived_tables(THD 
 
   DBUG_RETURN(0);
 end:
-  /* No need to rollback statement transaction, it's not started. */
-  DBUG_ASSERT(thd->transaction.stmt.is_empty());
+  /*
+    No need to commit/rollback the statement transaction: it's
+    either not started or we're filling in an INFORMATION_SCHEMA
+    table on the fly, and thus mustn't manipulate with the
+    transaction of the enclosing statement.
+  */
+  DBUG_ASSERT(thd->transaction.stmt.is_empty() ||
+              (thd->state_flags & Open_tables_state::BACKUPS_AVAIL));
   close_thread_tables(thd);
   /* Don't keep locks for a failed statement. */
   thd->mdl_context.rollback_to_savepoint(mdl_savepoint);


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

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: jon.hauglid@stripped
# target_branch: file:///export/home/x/mysql-5.5-runtime-bug55973/
# testament_sha1: ad177d44fa0f6f31645e086965204a3363ba1301
# timestamp: 2010-08-20 09:34:06 +0200
# base_revision_id: jon.hauglid@stripped\
#   p5qnczzbw9rxdpde
# 
# Begin bundle
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
A4CI8jWbw5GkL794jHMP/bP/i7kinChIZU6d2gA=


--===============5978729774061650382==--