Commit 78dec1f1 authored by Marko Mäkelä's avatar Marko Mäkelä

MDEV-26554: Stabilize the test

parent d6a3f425
...@@ -919,6 +919,7 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction ...@@ -919,6 +919,7 @@ ERROR HY000: Lock wait timeout exceeded; try restarting transaction
ALTER TABLE parent ADD COLUMN b INT, ALGORITHM=INSTANT; ALTER TABLE parent ADD COLUMN b INT, ALGORITHM=INSTANT;
ERROR HY000: Lock wait timeout exceeded; try restarting transaction ERROR HY000: Lock wait timeout exceeded; try restarting transaction
disconnect con1; disconnect con1;
SET innodb_lock_wait_timeout=DEFAULT;
TRUNCATE TABLE parent; TRUNCATE TABLE parent;
ALTER TABLE parent FORCE, ALGORITHM=COPY; ALTER TABLE parent FORCE, ALGORITHM=COPY;
ALTER TABLE parent FORCE, ALGORITHM=INPLACE; ALTER TABLE parent FORCE, ALGORITHM=INPLACE;
......
...@@ -925,6 +925,8 @@ ALTER TABLE parent FORCE, ALGORITHM=INPLACE; ...@@ -925,6 +925,8 @@ ALTER TABLE parent FORCE, ALGORITHM=INPLACE;
--error ER_LOCK_WAIT_TIMEOUT --error ER_LOCK_WAIT_TIMEOUT
ALTER TABLE parent ADD COLUMN b INT, ALGORITHM=INSTANT; ALTER TABLE parent ADD COLUMN b INT, ALGORITHM=INSTANT;
disconnect con1; disconnect con1;
# Restore the timeout to avoid occasional races with purge.
SET innodb_lock_wait_timeout=DEFAULT;
TRUNCATE TABLE parent; TRUNCATE TABLE parent;
ALTER TABLE parent FORCE, ALGORITHM=COPY; ALTER TABLE parent FORCE, ALGORITHM=COPY;
ALTER TABLE parent FORCE, ALGORITHM=INPLACE; ALTER TABLE parent FORCE, ALGORITHM=INPLACE;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment