List:Commits« Previous MessageNext Message »
From:Davi Arnaut Date:July 13 2010 2:56pm
Subject:bzr commit into mysql-5.1-bugteam branch (davi:3478) Bug#54453
View as plain text  
# At a local mysql-5.1-bugteam repository of davi

 3478 Davi Arnaut	2010-07-13
      Bug#54453: Failing assertion: trx->active_trans when renaming a
                 table with active trx
      
      Essentially, the problem is that InnoDB does a implicit commit
      when a cursor (table handler) is unlocked/closed, creating
      a dissonance between the transaction state within the server
      layer and the storage engine layer. Theoretically, a statement
      transaction can encompass several table instances in a similar
      manner to a multiple statement transaction, hence it does not
      make sense to limit a statement transaction to the lifetime of
      the table instances (cursors) used within it.
      
      Since this particular instance of the problem is only triggerable
      on 5.1 and is masked on 5.5 due to metadata locks, the solution
      (which is less risky) is to explicitly end the transaction before
      the cached table is unlock on rename table.
      
      The patch is to be null merged into trunk and the bug left open
      to address the underlying problem in later versions.
     @ mysql-test/include/commit.inc
        Fix counters, transaction is explicitly ended now.
     @ mysql-test/suite/innodb_plugin/r/innodb_bug54453.result
        Add test case result for Bug#54453
     @ mysql-test/suite/innodb_plugin/t/innodb_bug54453.test
        Add test case for Bug#54453
     @ sql/sql_table.cc
        End transaction as otherwise InnoDB will end it behind our backs.

    added:
      mysql-test/suite/innodb_plugin/r/innodb_bug54453.result
      mysql-test/suite/innodb_plugin/t/innodb_bug54453.test
    modified:
      mysql-test/include/commit.inc
      mysql-test/r/commit_1innodb.result
      sql/sql_table.cc
=== modified file 'mysql-test/include/commit.inc'
--- a/mysql-test/include/commit.inc	2009-08-26 23:13:03 +0000
+++ b/mysql-test/include/commit.inc	2010-07-13 14:56:24 +0000
@@ -725,9 +725,9 @@ call p_verify_status_increment(4, 4, 4,
 alter table t3 add column (b int);
 call p_verify_status_increment(2, 0, 2, 0);
 alter table t3 rename t4;
-call p_verify_status_increment(2, 2, 2, 2);
+call p_verify_status_increment(1, 0, 1, 0);
 rename table t4 to t3;
-call p_verify_status_increment(2, 2, 2, 2);
+call p_verify_status_increment(1, 0, 1, 0);
 truncate table t3;
 call p_verify_status_increment(4, 4, 4, 4);
 create view v1 as select * from t2;

=== modified file 'mysql-test/r/commit_1innodb.result'
--- a/mysql-test/r/commit_1innodb.result	2009-08-26 23:13:03 +0000
+++ b/mysql-test/r/commit_1innodb.result	2010-07-13 14:56:24 +0000
@@ -841,11 +841,11 @@ call p_verify_status_increment(2, 0, 2,
 SUCCESS
 
 alter table t3 rename t4;
-call p_verify_status_increment(2, 2, 2, 2);
+call p_verify_status_increment(1, 0, 1, 0);
 SUCCESS
 
 rename table t4 to t3;
-call p_verify_status_increment(2, 2, 2, 2);
+call p_verify_status_increment(1, 0, 1, 0);
 SUCCESS
 
 truncate table t3;

=== added file 'mysql-test/suite/innodb_plugin/r/innodb_bug54453.result'
--- a/mysql-test/suite/innodb_plugin/r/innodb_bug54453.result	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/innodb_plugin/r/innodb_bug54453.result	2010-07-13 14:56:24 +0000
@@ -0,0 +1,12 @@
+#
+# Bug#54453: Failing assertion: trx->active_trans when renaming a table with active trx
+#
+DROP TABLE IF EXISTS bug54453;
+CREATE TABLE bug54453(a INT) ENGINE=InnoDB;
+BEGIN;
+INSERT INTO bug54453 VALUES (1);
+ALTER TABLE bug54453 RENAME TO bug54453_2;
+ROLLBACK;
+SELECT * FROM bug54453_2;
+a
+DROP TABLE bug54453_2;

=== added file 'mysql-test/suite/innodb_plugin/t/innodb_bug54453.test'
--- a/mysql-test/suite/innodb_plugin/t/innodb_bug54453.test	1970-01-01 00:00:00 +0000
+++ b/mysql-test/suite/innodb_plugin/t/innodb_bug54453.test	2010-07-13 14:56:24 +0000
@@ -0,0 +1,23 @@
+--source include/have_innodb_plugin.inc
+--source include/have_log_bin.inc
+
+--echo #
+--echo # Bug#54453: Failing assertion: trx->active_trans when renaming a table with active trx
+--echo #
+
+--disable_warnings
+DROP TABLE IF EXISTS bug54453;
+--enable_warnings
+
+CREATE TABLE bug54453(a INT) ENGINE=InnoDB;
+--connect(con1,localhost,root,,)
+BEGIN;
+INSERT INTO bug54453 VALUES (1);
+--connection default
+ALTER TABLE bug54453 RENAME TO bug54453_2;
+--connection con1
+ROLLBACK;
+--disconnect con1
+--connection default
+SELECT * FROM bug54453_2;
+DROP TABLE bug54453_2;

=== modified file 'sql/sql_table.cc'
--- a/sql/sql_table.cc	2010-06-10 20:45:22 +0000
+++ b/sql/sql_table.cc	2010-07-13 14:56:24 +0000
@@ -6848,6 +6848,14 @@ view_err:
     if (!error && (new_name != table_name || new_db != db))
     {
       thd_proc_info(thd, "rename");
+
+      /*
+        Workaround InnoDB ending the transaction when the table instance
+        is unlocked/closed (close_cached_table below), otherwise the trx
+        state will differ between the server and storage engine layers.
+      */
+      ha_autocommit_or_rollback(thd, 0);
+
       /*
         Then do a 'simple' rename of the table. First we need to close all
         instances of 'source' table.


Attachment: [text/bzr-bundle] bzr/davi.arnaut@sun.com-20100713145624-qkj6hy5qjj0b1oxy.bundle
Thread
bzr commit into mysql-5.1-bugteam branch (davi:3478) Bug#54453Davi Arnaut13 Jul
Re: bzr commit into mysql-5.1-bugteam branch (davi:3478) Bug#54453Konstantin Osipov19 Jul
  • Re: bzr commit into mysql-5.1-bugteam branch (davi:3478) Bug#54453Davi Arnaut19 Jul