From: Jon Olav Hauglid
Date: August 19 2010 2:25pm
Subject: bzr commit into mysql-5.5-bugfixing branch (jon.hauglid:3114) Bug#55973
List-Archive: http://lists.mysql.com/commits/116267
X-Bug: 55973
Message-Id: <201008191427.o7JER01P015003@rcsinet15.oracle.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5918311303997358649=="

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

#At file:///export/home/x/mysql-5.5-runtime-bug55973/ based on revid:jon.hauglid@stripped

 3114 Jon Olav Hauglid	2010-08-19
      Bug #55973 Assertion `thd->transaction.stmt.is_empty()'
                 on CREATE TABLE .. SELECT I_S.PART
      
      This assert could be 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.
      
      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, CREATE TABLE ... AS SELECT starts a transaction in order
      to insert tuples into the new table. And if the SELECT is an I_S query,
      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 then
      trigger the assert.
      
      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
=== 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-19 14:25:47 +0000
@@ -89,3 +89,13 @@ 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;
+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-19 14:25:47 +0000
@@ -89,3 +89,21 @@ 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;
+
+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-19 14:25:47 +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);


--===============5918311303997358649==
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: 2c1685d0c66ce7d43f4037513508ce26886f1ade
# timestamp: 2010-08-19 16:25:51 +0200
# base_revision_id: jon.hauglid@stripped\
#   p5qnczzbw9rxdpde
# 
# Begin bundle
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


--===============5918311303997358649==--