mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-16 03:52:35 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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

Browse source 
- Returns DB_LOCK_WAIT_TIMEOUT for the stats_lock_fail
debug sync point
This commit is contained in:
Thirunarayanan Balathandayuthapani 2023-01-05 11:06:35 +05:30
parent fe38d7cad4
commit 12a85c6caf
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
mysql-test/suite/innodb_fts/r/misc_debug.result
View file

@ -68,7 +68,7 @@ DROP TABLE t1;
CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB;
SET DEBUG_DBUG="+d,stats_lock_fail";
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;
ALTER TABLE t1 DISCARD TABLESPACE;
ALTER TABLE t1 ADD FULLTEXT(f2);

2
mysql-test/suite/innodb_fts/t/misc_debug.test
View file

@ -108,7 +108,7 @@ DROP TABLE t1;
CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB;
SET DEBUG_DBUG="+d,stats_lock_fail";
--error ER_GET_ERRNO
--error ER_LOCK_WAIT_TIMEOUT
ALTER TABLE t1 ADD FULLTEXT(f2);
SET debug_dbug=@saved_debug_dbug;
ALTER TABLE t1 DISCARD TABLESPACE;

2
storage/innobase/handler/handler0alter.cc
View file

@ -11273,7 +11273,7 @@ err_index:
}
DBUG_EXECUTE_IF("stats_lock_fail",
error = DB_LOCK_WAIT;);
error = DB_LOCK_WAIT_TIMEOUT;);
if (error == DB_SUCCESS) {
error = lock_sys_tables(trx);