From: Jon Olav Hauglid Date: June 1 2011 11:52am Subject: bzr commit into mysql-5.5 branch (jon.hauglid:3419) Bug#11853126 List-Archive: http://lists.mysql.com/commits/138538 X-Bug: 11853126 Message-Id: <201106011152.p51Bqe2E028113@acsmt357.oracle.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============4355647533418387574==" --===============4355647533418387574== 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-test/ based on revid:bjorn.munch@stripped 3419 Jon Olav Hauglid 2011-06-01 Bug#11853126 RE-ENABLE CONCURRENT READS WHILE CREATING SECONDARY INDEX IN INNODB This is a follow-up patch. This patch moves part of the new test coverage to a test file that is only run on debug builds since it used debug- only features and therefore broke the test case on release builds. modified: mysql-test/r/innodb_mysql_lock.result mysql-test/r/innodb_mysql_sync.result mysql-test/t/innodb_mysql_lock.test mysql-test/t/innodb_mysql_sync.test === modified file 'mysql-test/r/innodb_mysql_lock.result' --- a/mysql-test/r/innodb_mysql_lock.result 2011-06-01 08:06:55 +0000 +++ b/mysql-test/r/innodb_mysql_lock.result 2011-06-01 11:52:20 +0000 @@ -153,7 +153,6 @@ DROP VIEW v1; # KEY NO 0 FOR TABLE IN ERROR LOG # DROP TABLE IF EXISTS t1; -# Test 1: Secondary index # Connection default CREATE TABLE t1 (id INT PRIMARY KEY, value INT) ENGINE = InnoDB; INSERT INTO t1 VALUES (1, 12345); @@ -173,20 +172,3 @@ id value 1 12345 COMMIT; DROP TABLE t1; -# Test 2: Primary index -CREATE TABLE t1(a INT NOT NULL, b INT NOT NULL) engine=innodb; -INSERT INTO t1 VALUES (1, 12345), (2, 23456); -# Connection con1 -SET SESSION debug= "+d,alter_table_rollback_new_index"; -ALTER TABLE t1 ADD PRIMARY KEY(a); -ERROR HY000: Unknown error -SELECT * FROM t1; -a b -1 12345 -2 23456 -# Connection default -SELECT * FROM t1; -a b -1 12345 -2 23456 -DROP TABLE t1; === modified file 'mysql-test/r/innodb_mysql_sync.result' --- a/mysql-test/r/innodb_mysql_sync.result 2011-06-01 08:06:55 +0000 +++ b/mysql-test/r/innodb_mysql_sync.result 2011-06-01 11:52:20 +0000 @@ -165,3 +165,24 @@ SET DEBUG_SYNC= "now SIGNAL query"; # Reaping: ALTER TABLE t1 ADD UNIQUE (b) SET DEBUG_SYNC= "RESET"; DROP TABLE t1; +# +# Bug#11853126 RE-ENABLE CONCURRENT READS WHILE CREATING SECONDARY INDEX +# IN INNODB +# +DROP TABLE IF EXISTS t1; +CREATE TABLE t1(a INT NOT NULL, b INT NOT NULL) engine=innodb; +INSERT INTO t1 VALUES (1, 12345), (2, 23456); +# Connection con1 +SET SESSION debug= "+d,alter_table_rollback_new_index"; +ALTER TABLE t1 ADD PRIMARY KEY(a); +ERROR HY000: Unknown error +SELECT * FROM t1; +a b +1 12345 +2 23456 +# Connection default +SELECT * FROM t1; +a b +1 12345 +2 23456 +DROP TABLE t1; === modified file 'mysql-test/t/innodb_mysql_lock.test' --- a/mysql-test/t/innodb_mysql_lock.test 2011-06-01 08:06:55 +0000 +++ b/mysql-test/t/innodb_mysql_lock.test 2011-06-01 11:52:20 +0000 @@ -290,8 +290,6 @@ DROP TABLE IF EXISTS t1; --connect (con1,localhost,root) ---echo # Test 1: Secondary index - --echo # Connection default connection default; CREATE TABLE t1 (id INT PRIMARY KEY, value INT) ENGINE = InnoDB; @@ -314,22 +312,6 @@ ALTER TABLE t1 ADD INDEX idx(value); SELECT * FROM t1; COMMIT; DROP TABLE t1; - ---echo # Test 2: Primary index -CREATE TABLE t1(a INT NOT NULL, b INT NOT NULL) engine=innodb; -INSERT INTO t1 VALUES (1, 12345), (2, 23456); - ---echo # Connection con1 ---connection con1 -SET SESSION debug= "+d,alter_table_rollback_new_index"; ---error ER_UNKNOWN_ERROR -ALTER TABLE t1 ADD PRIMARY KEY(a); -SELECT * FROM t1; - ---echo # Connection default ---connection default -SELECT * FROM t1; -DROP TABLE t1; disconnect con1; === modified file 'mysql-test/t/innodb_mysql_sync.test' --- a/mysql-test/t/innodb_mysql_sync.test 2011-06-01 08:06:55 +0000 +++ b/mysql-test/t/innodb_mysql_sync.test 2011-06-01 11:52:20 +0000 @@ -2,6 +2,7 @@ # Test file for InnoDB tests that require the debug sync facility # --source include/have_innodb.inc +--source include/have_debug.inc --source include/have_debug_sync.inc # Save the initial number of concurrent sessions. --source include/count_sessions.inc @@ -277,6 +278,32 @@ SET DEBUG_SYNC= "RESET"; DROP TABLE t1; +--echo # +--echo # Bug#11853126 RE-ENABLE CONCURRENT READS WHILE CREATING SECONDARY INDEX +--echo # IN INNODB +--echo # + +--disable_warnings +DROP TABLE IF EXISTS t1; +--enable_warnings + +CREATE TABLE t1(a INT NOT NULL, b INT NOT NULL) engine=innodb; +INSERT INTO t1 VALUES (1, 12345), (2, 23456); + +--echo # Connection con1 +--connect (con1,localhost,root) +SET SESSION debug= "+d,alter_table_rollback_new_index"; +--error ER_UNKNOWN_ERROR +ALTER TABLE t1 ADD PRIMARY KEY(a); +SELECT * FROM t1; + +--echo # Connection default +--connection default +SELECT * FROM t1; +DROP TABLE t1; +disconnect con1; + + # Check that all connections opened by test cases in this file are really # gone so execution of other tests won't be affected by their presence. --source include/wait_until_count_sessions.inc --===============4355647533418387574== 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-test/ # testament_sha1: ef6da66c238772557dc5dba84c742ba8eef3cf8d # timestamp: 2011-06-01 13:52:31 +0200 # source_branch: file:///export/home/x/mysql-5.1-bug50619/ # base_revision_id: bjorn.munch@stripped\ # 6yxf83on2ohkyrfs # # Begin bundle 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 Jy0ID7V5BldRWXcZ/xdyRThQkCF9JN4= --===============4355647533418387574==--