diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2008-12-10 09:11:59 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2008-12-10 09:11:59 +0100 |
| commit | 4721520cdf9f4fe84b50865ed985c4f5e179f24b (patch) | |
| tree | a56c8f0037f5c1f05a932f0d01c3a20f2b3e5cb1 /mysql-test/suite | |
| parent | 9cb4c7209ac91f5466e889684db05b7bc7e88360 (diff) | |
| parent | 8adc9d1b86317fceb57611565dc344e5baa05eb0 (diff) | |
| download | mariadb-git-4721520cdf9f4fe84b50865ed985c4f5e179f24b.tar.gz | |
merge
Diffstat (limited to 'mysql-test/suite')
| -rw-r--r-- | mysql-test/suite/parts/r/partition_special_innodb.result | 5 | ||||
| -rw-r--r-- | mysql-test/suite/parts/t/partition_special_innodb.test | 2 |
2 files changed, 7 insertions, 0 deletions
diff --git a/mysql-test/suite/parts/r/partition_special_innodb.result b/mysql-test/suite/parts/r/partition_special_innodb.result index 5eab78de8c2..8869f6d450c 100644 --- a/mysql-test/suite/parts/r/partition_special_innodb.result +++ b/mysql-test/suite/parts/r/partition_special_innodb.result @@ -213,5 +213,10 @@ START TRANSACTION; INSERT INTO t1 VALUES (NULL, 'first row t2'); SET autocommit=OFF; ALTER TABLE t1 AUTO_INCREMENT = 10; +ERROR HY000: Lock wait timeout exceeded; try restarting transaction INSERT INTO t1 VALUES (NULL, 'second row t2'); +SELECT a,b FROM t1 ORDER BY a; +a b +1 first row t2 +2 second row t2 DROP TABLE t1; diff --git a/mysql-test/suite/parts/t/partition_special_innodb.test b/mysql-test/suite/parts/t/partition_special_innodb.test index b9fc8bdcd56..eac19f6d588 100644 --- a/mysql-test/suite/parts/t/partition_special_innodb.test +++ b/mysql-test/suite/parts/t/partition_special_innodb.test @@ -68,10 +68,12 @@ INSERT INTO t1 VALUES (NULL, 'first row t2'); --connection con2 SET autocommit=OFF; +--error ER_LOCK_WAIT_TIMEOUT ALTER TABLE t1 AUTO_INCREMENT = 10; --connection con1 INSERT INTO t1 VALUES (NULL, 'second row t2'); +SELECT a,b FROM t1 ORDER BY a; --disconnect con2 --disconnect con1 --connection default |