diff options
author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-11 13:56:47 +0300 |
---|---|---|
committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-10-11 13:56:47 +0300 |
commit | e8101a4d033a59237d542f4bd0ae0b5323058e26 (patch) | |
tree | 20fbbf2aacdcde3cffbaa7b97b02c898d92f83c3 | |
parent | 7a28c82dcddc82008e5d9a8a27b95e9597295e23 (diff) | |
download | mariadb-git-e8101a4d033a59237d542f4bd0ae0b5323058e26.tar.gz |
MDEV-19455/MDEV-29342 fixup: Avoid DEBUG_DBUG=-d,...
-rw-r--r-- | mysql-test/suite/innodb_fts/r/misc_debug.result | 3 | ||||
-rw-r--r-- | mysql-test/suite/innodb_fts/r/misc_debug2.result | 5 | ||||
-rw-r--r-- | mysql-test/suite/innodb_fts/t/misc_debug.test | 3 | ||||
-rw-r--r-- | mysql-test/suite/innodb_fts/t/misc_debug2.test | 5 |
4 files changed, 8 insertions, 8 deletions
diff --git a/mysql-test/suite/innodb_fts/r/misc_debug.result b/mysql-test/suite/innodb_fts/r/misc_debug.result index 9f13822ecda..be5d9b7698e 100644 --- a/mysql-test/suite/innodb_fts/r/misc_debug.result +++ b/mysql-test/suite/innodb_fts/r/misc_debug.result @@ -54,9 +54,8 @@ DROP TABLE t1; # MDEV-25663 Double free of transaction during TRUNCATE # call mtr.add_suppression("InnoDB: \\(Too many concurrent transactions\\)"); -SET DEBUG_DBUG='-d,ib_create_table_fail_too_many_trx'; -CREATE TABLE t1 (b CHAR(12), FULLTEXT KEY(b)) engine=InnoDB; SET @save_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'; TRUNCATE t1; ERROR HY000: Got error -1 "Internal error < 0 (Not system error)" from storage engine InnoDB diff --git a/mysql-test/suite/innodb_fts/r/misc_debug2.result b/mysql-test/suite/innodb_fts/r/misc_debug2.result index 583d43bd9db..a36561df96e 100644 --- a/mysql-test/suite/innodb_fts/r/misc_debug2.result +++ b/mysql-test/suite/innodb_fts/r/misc_debug2.result @@ -10,11 +10,12 @@ DROP TABLE mdev21563; # CREATE TABLE t1(f1 CHAR(100), FULLTEXT idx(f1))ENGINE=InnoDB; INSERT INTO t1 VALUES('mysql'), ('innodb'); +SET @save_dbug=@@debug_dbug; set debug_dbug="+d,fts_instrument_sync_debug"; INSERT INTO t1 VALUES('test'); -set debug_dbug="-d,fts_instrument_sync_debug"; +set debug_dbug=@save_dbug; INSERT INTO t1 VALUES('This is a fts issue'); set debug_dbug="+d,fts_instrument_sync_debug"; UPDATE t1 SET f1="mariadb"; -set debug_dbug="-d,fts_instrument_sync_debug"; +set debug_dbug=@save_dbug; DROP TABLE t1; diff --git a/mysql-test/suite/innodb_fts/t/misc_debug.test b/mysql-test/suite/innodb_fts/t/misc_debug.test index c8542152d4d..cf3651e14a2 100644 --- a/mysql-test/suite/innodb_fts/t/misc_debug.test +++ b/mysql-test/suite/innodb_fts/t/misc_debug.test @@ -84,10 +84,9 @@ DROP TABLE t1; --echo # MDEV-25663 Double free of transaction during TRUNCATE --echo # call mtr.add_suppression("InnoDB: \\(Too many concurrent transactions\\)"); -SET DEBUG_DBUG='-d,ib_create_table_fail_too_many_trx'; +SET @save_dbug= @@debug_dbug; CREATE TABLE t1 (b CHAR(12), FULLTEXT KEY(b)) engine=InnoDB; -SET @save_dbug= @@debug_dbug; SET debug_dbug='+d,ib_create_table_fail_too_many_trx'; --error ER_GET_ERRNO TRUNCATE t1; diff --git a/mysql-test/suite/innodb_fts/t/misc_debug2.test b/mysql-test/suite/innodb_fts/t/misc_debug2.test index 1ba77f2481e..815be816afd 100644 --- a/mysql-test/suite/innodb_fts/t/misc_debug2.test +++ b/mysql-test/suite/innodb_fts/t/misc_debug2.test @@ -16,12 +16,13 @@ DROP TABLE mdev21563; --echo # CREATE TABLE t1(f1 CHAR(100), FULLTEXT idx(f1))ENGINE=InnoDB; INSERT INTO t1 VALUES('mysql'), ('innodb'); +SET @save_dbug=@@debug_dbug; set debug_dbug="+d,fts_instrument_sync_debug"; INSERT INTO t1 VALUES('test'); -set debug_dbug="-d,fts_instrument_sync_debug"; +set debug_dbug=@save_dbug; INSERT INTO t1 VALUES('This is a fts issue'); --source include/restart_mysqld.inc set debug_dbug="+d,fts_instrument_sync_debug"; UPDATE t1 SET f1="mariadb"; -set debug_dbug="-d,fts_instrument_sync_debug"; +set debug_dbug=@save_dbug; DROP TABLE t1; |