diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-23 17:37:52 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-23 17:37:52 +0300 |
| commit | 3c92050d1c907cc548e848d0ab2891a06681ad92 (patch) | |
| tree | 27ea08091389453521b52f15c6dffe3d70ecb68b /mysql-test/suite/innodb | |
| parent | 13eae1885e739a234cebd592f891e87f387784c6 (diff) | |
| download | mariadb-git-3c92050d1c907cc548e848d0ab2891a06681ad92.tar.gz | |
Fix build without either ENABLED_DEBUG_SYNC or DBUG_OFF
There are separate flags DBUG_OFF for disabling the DBUG facility
and ENABLED_DEBUG_SYNC for enabling the DEBUG_SYNC facility.
Let us allow debug builds without DEBUG_SYNC.
Note: For CMAKE_BUILD_TYPE=Debug, CMakeLists.txt will continue to
define ENABLED_DEBUG_SYNC.
Diffstat (limited to 'mysql-test/suite/innodb')
| -rw-r--r-- | mysql-test/suite/innodb/t/alter_crash.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/alter_mdl_timeout.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/autoinc_debug.test | 1 | ||||
| -rw-r--r-- | mysql-test/suite/innodb/t/blob-crash.test | 7 |
4 files changed, 7 insertions, 3 deletions
diff --git a/mysql-test/suite/innodb/t/alter_crash.test b/mysql-test/suite/innodb/t/alter_crash.test index 72116b0ca9d..7a2f4452f4d 100644 --- a/mysql-test/suite/innodb/t/alter_crash.test +++ b/mysql-test/suite/innodb/t/alter_crash.test @@ -4,6 +4,7 @@ --source include/not_embedded.inc --source include/have_innodb.inc --source include/have_debug.inc +--source include/have_debug_sync.inc --source include/not_crashrep.inc --disable_query_log diff --git a/mysql-test/suite/innodb/t/alter_mdl_timeout.test b/mysql-test/suite/innodb/t/alter_mdl_timeout.test index 15e7f524fd0..0ce23646090 100644 --- a/mysql-test/suite/innodb/t/alter_mdl_timeout.test +++ b/mysql-test/suite/innodb/t/alter_mdl_timeout.test @@ -1,5 +1,6 @@ --source include/have_innodb.inc --source include/have_debug.inc +--source include/have_debug_sync.inc create table t1(f1 char(10), f2 char(10) not null, f3 int not null, f4 int not null, primary key(f3))engine=innodb; diff --git a/mysql-test/suite/innodb/t/autoinc_debug.test b/mysql-test/suite/innodb/t/autoinc_debug.test index 2e662565490..3700db63547 100644 --- a/mysql-test/suite/innodb/t/autoinc_debug.test +++ b/mysql-test/suite/innodb/t/autoinc_debug.test @@ -1,5 +1,6 @@ --source include/have_innodb.inc --source include/have_debug.inc +--source include/have_debug_sync.inc --source include/not_embedded.inc # Two parallel connection with autoinc column after restart. diff --git a/mysql-test/suite/innodb/t/blob-crash.test b/mysql-test/suite/innodb/t/blob-crash.test index beb500553ea..8af4a16d40c 100644 --- a/mysql-test/suite/innodb/t/blob-crash.test +++ b/mysql-test/suite/innodb/t/blob-crash.test @@ -1,6 +1,7 @@ ---source include/maybe_debug.inc --source include/innodb_page_size_small.inc +let $have_debug_sync=`select count(*) = 1 from information_schema.session_variables where variable_name = 'debug_sync' and variable_value like 'on %'`; + --echo # --echo # Bug #16963396 INNODB: USE OF LARGE EXTERNALLY-STORED FIELDS MAKES --echo # CRASH RECOVERY LOSE DATA @@ -94,7 +95,7 @@ select f1, right(f2, 20), right(f3, 20) from t2; update t2 set f3 = '&'; select f1, right(f2, 20), right(f3, 20) from t2; -if ($have_debug) { +if ($have_debug_sync) { --disable_query_log set DEBUG_SYNC='blob_rollback_middle SIGNAL stuck WAIT_FOR ever'; send ROLLBACK; @@ -102,7 +103,7 @@ send ROLLBACK; } connection default; -if ($have_debug) { +if ($have_debug_sync) { --disable_query_log SET DEBUG_SYNC = 'now WAIT_FOR stuck'; --enable_query_log |