diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-12 12:14:13 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-12 12:14:13 +0300 |
| commit | a992c615a66341ec4c86d0f97fcdb36e3b837a54 (patch) | |
| tree | de1e5af122d35443a964c10d68c287022da084f6 /mysql-test/suite/innodb_fts/t/misc_debug.test | |
| parent | 15edd69ddf649ebf7ecab3fa72bc5dea263c0154 (diff) | |
| parent | 977c385df36dcb751720dc838521b7cb5a328cb9 (diff) | |
| download | mariadb-git-a992c615a66341ec4c86d0f97fcdb36e3b837a54.tar.gz | |
Merge 10.5 into 10.6
Diffstat (limited to 'mysql-test/suite/innodb_fts/t/misc_debug.test')
| -rw-r--r-- | mysql-test/suite/innodb_fts/t/misc_debug.test | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysql-test/suite/innodb_fts/t/misc_debug.test b/mysql-test/suite/innodb_fts/t/misc_debug.test index 6ab980a3948..c086348b631 100644 --- a/mysql-test/suite/innodb_fts/t/misc_debug.test +++ b/mysql-test/suite/innodb_fts/t/misc_debug.test @@ -87,6 +87,7 @@ DROP TABLE t1; --echo # call mtr.add_suppression("InnoDB: \\(Too many concurrent transactions\\)"); call mtr.add_suppression("InnoDB: Cannot save table statistics for table `test`\\.`t1`: Too many concurrent transactions"); +SET @saved_debug_dbug= @@debug_dbug; CREATE TABLE t1 (b CHAR(12), FULLTEXT KEY(b)) engine=InnoDB; SET debug_dbug='+d,ib_create_table_fail_too_many_trx'; @@ -102,7 +103,7 @@ CREATE TABLE t1(f1 INT NOT NULL, f2 CHAR(100))ENGINE=InnoDB; SET DEBUG_DBUG="+d,stats_lock_fail"; --error ER_GET_ERRNO ALTER TABLE t1 ADD FULLTEXT(f2); -SET DEBUG_DBUG="-d,stats_lock_fail"; +SET debug_dbug=@saved_debug_dbug; ALTER TABLE t1 DISCARD TABLESPACE; --error ER_TABLESPACE_DISCARDED ALTER TABLE t1 ADD FULLTEXT(f2); |