diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-23 13:40:42 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2022-09-23 13:40:42 +0300 |
| commit | a69cf6f07ee7286d4813ef5c602d5b79b39d3028 (patch) | |
| tree | 6068dad43fbda21245e341a6da0164fc7ef01bd1 /extra | |
| parent | db7e04ed3ab5d591a323443cb20c3a45792916b6 (diff) | |
| download | mariadb-git-a69cf6f07ee7286d4813ef5c602d5b79b39d3028.tar.gz | |
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
Diffstat (limited to 'extra')
| -rw-r--r-- | extra/mariabackup/xtrabackup.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/extra/mariabackup/xtrabackup.cc b/extra/mariabackup/xtrabackup.cc index a270a3edd04..714a7947b9e 100644 --- a/extra/mariabackup/xtrabackup.cc +++ b/extra/mariabackup/xtrabackup.cc @@ -6158,18 +6158,18 @@ static bool xtrabackup_prepare_func(char** argv) { for (int i= 0; i < got; i++) { -#ifndef DBUG_OFF +#ifdef DBUG_TRACE int rc= -#endif // !DBUG_OFF +#endif innobase_rollback_by_xid(NULL, xid_list + i); -#ifndef DBUG_OFF +#ifdef DBUG_TRACE if (rc == 0) { char buf[XIDDATASIZE * 4 + 6]; // see xid_to_str DBUG_PRINT("info", ("rollback xid %s", xid_to_str(buf, xid_list[i]))); } -#endif // !DBUG_OFF +#endif } } ut_d(recv_no_log_write= true); |