diff options
| author | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2011-06-01 13:52:20 +0200 |
|---|---|---|
| committer | Jon Olav Hauglid <jon.hauglid@oracle.com> | 2011-06-01 13:52:20 +0200 |
| commit | edcd89ee1ef8e9ce8685f725b68af0bdb349400c (patch) | |
| tree | 129ed9f30e45203260058d8bf4d728b16cb15f80 /mysql-test/r | |
| parent | fd717fb560be79e25e10d65ef16a9d3e7c3f22af (diff) | |
| download | mariadb-git-edcd89ee1ef8e9ce8685f725b68af0bdb349400c.tar.gz | |
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.
Diffstat (limited to 'mysql-test/r')
| -rw-r--r-- | mysql-test/r/innodb_mysql_lock.result | 18 | ||||
| -rw-r--r-- | mysql-test/r/innodb_mysql_sync.result | 21 |
2 files changed, 21 insertions, 18 deletions
diff --git a/mysql-test/r/innodb_mysql_lock.result b/mysql-test/r/innodb_mysql_lock.result index 4fdcf2383a8..4c7e7f11987 100644 --- a/mysql-test/r/innodb_mysql_lock.result +++ b/mysql-test/r/innodb_mysql_lock.result @@ -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; diff --git a/mysql-test/r/innodb_mysql_sync.result b/mysql-test/r/innodb_mysql_sync.result index 8e210a7e205..605aaf4df5a 100644 --- a/mysql-test/r/innodb_mysql_sync.result +++ b/mysql-test/r/innodb_mysql_sync.result @@ -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; |