MDEV-30346 Avoid block device required error in innodb_fts.misc_debug

- Returns DB_LOCK_WAIT_TIMEOUT for the stats_lock_fail
debug sync point
parent fe38d7ca
...@@ -68,7 +68,7 @@ DROP TABLE t1; ...@@ -68,7 +68,7 @@ DROP TABLE t1;
CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB; CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB;
SET DEBUG_DBUG="+d,stats_lock_fail"; SET DEBUG_DBUG="+d,stats_lock_fail";
ALTER TABLE t1 ADD FULLTEXT(f2); ALTER TABLE t1 ADD FULLTEXT(f2);
ERROR HY000: Got error 15 "Block device required" from storage engine InnoDB ERROR HY000: Lock wait timeout exceeded; try restarting transaction
SET debug_dbug=@saved_debug_dbug; SET debug_dbug=@saved_debug_dbug;
ALTER TABLE t1 DISCARD TABLESPACE; ALTER TABLE t1 DISCARD TABLESPACE;
ALTER TABLE t1 ADD FULLTEXT(f2); ALTER TABLE t1 ADD FULLTEXT(f2);
......
...@@ -108,7 +108,7 @@ DROP TABLE t1; ...@@ -108,7 +108,7 @@ DROP TABLE t1;
CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB; CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB;
SET DEBUG_DBUG="+d,stats_lock_fail"; SET DEBUG_DBUG="+d,stats_lock_fail";
--error ER_GET_ERRNO --error ER_LOCK_WAIT_TIMEOUT
ALTER TABLE t1 ADD FULLTEXT(f2); ALTER TABLE t1 ADD FULLTEXT(f2);
SET debug_dbug=@saved_debug_dbug; SET debug_dbug=@saved_debug_dbug;
ALTER TABLE t1 DISCARD TABLESPACE; ALTER TABLE t1 DISCARD TABLESPACE;
......
...@@ -11273,7 +11273,7 @@ ha_innobase::commit_inplace_alter_table( ...@@ -11273,7 +11273,7 @@ ha_innobase::commit_inplace_alter_table(
} }
DBUG_EXECUTE_IF("stats_lock_fail", DBUG_EXECUTE_IF("stats_lock_fail",
error = DB_LOCK_WAIT;); error = DB_LOCK_WAIT_TIMEOUT;);
if (error == DB_SUCCESS) { if (error == DB_SUCCESS) {
error = lock_sys_tables(trx); error = lock_sys_tables(trx);
......
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