diff options
| author | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-16 23:19:47 +0100 |
|---|---|---|
| committer | Vladislav Vaintroub <vvaintroub@mysql.com> | 2010-02-16 23:19:47 +0100 |
| commit | d4b10d1fd541505c850c32895d8a1f8308d35c15 (patch) | |
| tree | bb2aacb96d3588f443a65da32dbfa2b6508efb80 /mysql-test/suite/parts/t | |
| parent | 09dfcfa14bda0d57493a3a15949a8e50a73f6d88 (diff) | |
| parent | cbb02487f6b0e95b35e2ee6f3e3242108a75deca (diff) | |
| download | mariadb-git-d4b10d1fd541505c850c32895d8a1f8308d35c15.tar.gz | |
merge
Diffstat (limited to 'mysql-test/suite/parts/t')
| -rw-r--r-- | mysql-test/suite/parts/t/partition_special_innodb.test | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/mysql-test/suite/parts/t/partition_special_innodb.test b/mysql-test/suite/parts/t/partition_special_innodb.test index eac19f6d588..833e489558e 100644 --- a/mysql-test/suite/parts/t/partition_special_innodb.test +++ b/mysql-test/suite/parts/t/partition_special_innodb.test @@ -68,12 +68,10 @@ INSERT INTO t1 VALUES (NULL, 'first row t2'); --connection con2 SET autocommit=OFF; +SET SESSION lock_wait_timeout= 1; --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 |