diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-05 10:26:20 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2023-01-05 10:26:20 +0200 |
| commit | 95b2bff40b5789caa02c6b85c2d0a24a897d0422 (patch) | |
| tree | 57316aed578719b5640459b9f7cd5113c9601493 | |
| parent | c6507684f422f8b0c5a4e77a8fc14183c2ded5b7 (diff) | |
| parent | 12a85c6caf595c685336455e416099b6a8020534 (diff) | |
| download | mariadb-git-bb-10.6-MDEV-30289.tar.gz | |
Merge 10.6bb-10.6-MDEV-30289
| -rw-r--r-- | mysql-test/suite/innodb/r/insert_into_empty.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/insert_into_empty.test | 3 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_fts/r/misc_debug.result | 2 | ||||
| -rw-r--r-- | mysql-test/suite/innodb_fts/t/misc_debug.test | 2 | ||||
| -rw-r--r-- | storage/innobase/handler/handler0alter.cc | 2 |
5 files changed, 3 insertions, 8 deletions
diff --git a/mysql-test/suite/innodb/r/insert_into_empty.result b/mysql-test/suite/innodb/r/insert_into_empty.result index be5082489f8..eeff9428a49 100644 --- a/mysql-test/suite/innodb/r/insert_into_empty.result +++ b/mysql-test/suite/innodb/r/insert_into_empty.result @@ -197,8 +197,6 @@ DROP TABLE t1; # # MDEV-27214 Import with disabled keys corrupts meta-data like rows, indexes, ... # -SET UNIQUE_CHECKS=0; -SET FOREIGN_KEY_CHECKS=0; CREATE TABLE `t1` ( `id` int(11) NOT NULL, `a` int(11) DEFAULT NULL, diff --git a/mysql-test/suite/innodb/t/insert_into_empty.test b/mysql-test/suite/innodb/t/insert_into_empty.test index b545927d690..58b3cdce335 100644 --- a/mysql-test/suite/innodb/t/insert_into_empty.test +++ b/mysql-test/suite/innodb/t/insert_into_empty.test @@ -214,8 +214,6 @@ DROP TABLE t1; --echo # MDEV-27214 Import with disabled keys corrupts meta-data like rows, indexes, ... --echo # -SET UNIQUE_CHECKS=0; -SET FOREIGN_KEY_CHECKS=0; CREATE TABLE `t1` ( `id` int(11) NOT NULL, `a` int(11) DEFAULT NULL, @@ -231,5 +229,4 @@ SELECT TABLE_ROWS, AVG_ROW_LENGTH>0 FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_NAME='t1' AND TABLE_SCHEMA='test'; DROP TABLE t1; - --echo # End of 10.6 tests diff --git a/mysql-test/suite/innodb_fts/r/misc_debug.result b/mysql-test/suite/innodb_fts/r/misc_debug.result index 11df7d89f0b..cdfc4ff489a 100644 --- a/mysql-test/suite/innodb_fts/r/misc_debug.result +++ b/mysql-test/suite/innodb_fts/r/misc_debug.result @@ -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); diff --git a/mysql-test/suite/innodb_fts/t/misc_debug.test b/mysql-test/suite/innodb_fts/t/misc_debug.test index 229d468201e..08581768eec 100644 --- a/mysql-test/suite/innodb_fts/t/misc_debug.test +++ b/mysql-test/suite/innodb_fts/t/misc_debug.test @@ -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; diff --git a/storage/innobase/handler/handler0alter.cc b/storage/innobase/handler/handler0alter.cc index 2acf888e625..7c162b9af6a 100644 --- a/storage/innobase/handler/handler0alter.cc +++ b/storage/innobase/handler/handler0alter.cc @@ -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); |