diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-20 10:04:31 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-10-20 10:04:31 +0300 |
| commit | 78dec1f199458cff30062296b2cf0b42a71d2466 (patch) | |
| tree | 5daabb59f0d098b91a239ce7e81cba3eaadc9ff8 | |
| parent | d6a3f425ee215b22584281935e61506465a7601d (diff) | |
| download | mariadb-git-78dec1f199458cff30062296b2cf0b42a71d2466.tar.gz | |
MDEV-26554: Stabilize the test
| -rw-r--r-- | mysql-test/suite/innodb/r/foreign_key.result | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/foreign_key.test | 2 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mysql-test/suite/innodb/r/foreign_key.result b/mysql-test/suite/innodb/r/foreign_key.result index 822ad4b6edd..509f13715b8 100644 --- a/mysql-test/suite/innodb/r/foreign_key.result +++ b/mysql-test/suite/innodb/r/foreign_key.result @@ -919,6 +919,7 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction ALTER TABLE parent ADD COLUMN b INT, ALGORITHM=INSTANT; ERROR HY000: Lock wait timeout exceeded; try restarting transaction disconnect con1; +SET innodb_lock_wait_timeout=DEFAULT; TRUNCATE TABLE parent; ALTER TABLE parent FORCE, ALGORITHM=COPY; ALTER TABLE parent FORCE, ALGORITHM=INPLACE; diff --git a/mysql-test/suite/innodb/t/foreign_key.test b/mysql-test/suite/innodb/t/foreign_key.test index ab3e4748fcb..363aa66237b 100644 --- a/mysql-test/suite/innodb/t/foreign_key.test +++ b/mysql-test/suite/innodb/t/foreign_key.test @@ -925,6 +925,8 @@ ALTER TABLE parent FORCE, ALGORITHM=INPLACE; --error ER_LOCK_WAIT_TIMEOUT ALTER TABLE parent ADD COLUMN b INT, ALGORITHM=INSTANT; disconnect con1; +# Restore the timeout to avoid occasional races with purge. +SET innodb_lock_wait_timeout=DEFAULT; TRUNCATE TABLE parent; ALTER TABLE parent FORCE, ALGORITHM=COPY; ALTER TABLE parent FORCE, ALGORITHM=INPLACE; |