diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-11 11:12:11 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-09-11 11:12:11 +0300 |
| commit | ac064c2b4721fe3d7cafae3b4dfa5853f0797347 (patch) | |
| tree | d41e5659806db309c8cba5b52234c7a7e834e308 | |
| parent | d09426f9e60fd93296464ec9eb5f9d85566437d3 (diff) | |
| download | mariadb-git-ac064c2b4721fe3d7cafae3b4dfa5853f0797347.tar.gz | |
Fix an occasional timeout in innodb.alter_partitioned
| -rw-r--r-- | mysql-test/suite/innodb/r/alter_partitioned.result | 4 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/alter_partitioned.test | 4 |
2 files changed, 8 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/alter_partitioned.result b/mysql-test/suite/innodb/r/alter_partitioned.result index 285e9fd2c54..fe8aabb796c 100644 --- a/mysql-test/suite/innodb/r/alter_partitioned.result +++ b/mysql-test/suite/innodb/r/alter_partitioned.result @@ -11,6 +11,8 @@ SAVEPOINT sp; INSERT INTO t1 (pk) VALUES (1); ROLLBACK TO SAVEPOINT sp; connection default; +SET @save_timeout=@@lock_wait_timeout; +SET @save_innodb_timeout=@@innodb_lock_wait_timeout; SET lock_wait_timeout=0; Warnings: Warning 1292 Truncated incorrect lock_wait_timeout value: '0' @@ -19,6 +21,8 @@ Warnings: Warning 1292 Truncated incorrect innodb_lock_wait_timeout value: '0' ALTER TABLE t1 PARTITION BY HASH(pk); ERROR HY000: Lock wait timeout exceeded; try restarting transaction +SET lock_wait_timeout=@save_timeout; +SET innodb_lock_wait_timeout=@save_innodb_timeout; SHOW CREATE TABLE t1; Table Create Table t1 CREATE TABLE `t1` ( diff --git a/mysql-test/suite/innodb/t/alter_partitioned.test b/mysql-test/suite/innodb/t/alter_partitioned.test index 1ce50dbdd0b..f8ffb06af45 100644 --- a/mysql-test/suite/innodb/t/alter_partitioned.test +++ b/mysql-test/suite/innodb/t/alter_partitioned.test @@ -18,10 +18,14 @@ INSERT INTO t1 (pk) VALUES (1); ROLLBACK TO SAVEPOINT sp; --connection default +SET @save_timeout=@@lock_wait_timeout; +SET @save_innodb_timeout=@@innodb_lock_wait_timeout; SET lock_wait_timeout=0; SET innodb_lock_wait_timeout=0; --error ER_LOCK_WAIT_TIMEOUT ALTER TABLE t1 PARTITION BY HASH(pk); +SET lock_wait_timeout=@save_timeout; +SET innodb_lock_wait_timeout=@save_innodb_timeout; SHOW CREATE TABLE t1; --connection con1 |