From a69cf6f07ee7286d4813ef5c602d5b79b39d3028 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Marko=20M=C3=A4kel=C3=A4?= Date: Fri, 23 Sep 2022 13:40:42 +0300 Subject: MDEV-29613 Improve WITH_DBUG_TRACE=OFF In commit 28325b08633372cc343dfcbc41fe252020cf6e6e a compile-time option was introduced to disable the macros DBUG_ENTER and DBUG_RETURN or DBUG_VOID_RETURN. The parameter name WITH_DBUG_TRACE would hint that it also covers DBUG_PRINT statements. Let us do that: WITH_DBUG_TRACE=OFF shall disable DBUG_PRINT() as well. A few InnoDB recovery tests used to check that some output from DBUG_PRINT("ib_log", ...) is present. We can live without those checks. Reviewed by: Vladislav Vaintroub --- mysql-test/suite/encryption/r/debug_key_management.result | 1 - mysql-test/suite/encryption/t/debug_key_management.test | 1 - 2 files changed, 2 deletions(-) (limited to 'mysql-test/suite/encryption') diff --git a/mysql-test/suite/encryption/r/debug_key_management.result b/mysql-test/suite/encryption/r/debug_key_management.result index 911a369f0c6..7fe681d52ae 100644 --- a/mysql-test/suite/encryption/r/debug_key_management.result +++ b/mysql-test/suite/encryption/r/debug_key_management.result @@ -15,7 +15,6 @@ set global debug_key_management_version=10; select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10; count(*) 0 -SET GLOBAL debug_dbug = '+d,ib_log'; SET GLOBAL innodb_log_checkpoint_now = 1; SET GLOBAL innodb_flush_log_at_trx_commit = 1; INSERT INTO t1 VALUES(NULL); diff --git a/mysql-test/suite/encryption/t/debug_key_management.test b/mysql-test/suite/encryption/t/debug_key_management.test index c370ecf5bd8..15a560d4c42 100644 --- a/mysql-test/suite/encryption/t/debug_key_management.test +++ b/mysql-test/suite/encryption/t/debug_key_management.test @@ -25,7 +25,6 @@ let $wait_condition= select count(*) = $tables_count from information_schema.inn select count(*) from information_schema.innodb_tablespaces_encryption where current_key_version <> 10; # Test redo log key rotation and crash recovery. -SET GLOBAL debug_dbug = '+d,ib_log'; SET GLOBAL innodb_log_checkpoint_now = 1; SET GLOBAL innodb_flush_log_at_trx_commit = 1; INSERT INTO t1 VALUES(NULL); -- cgit v1.2.1