diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 07:41:35 +0200 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2022-10-04 07:41:35 +0200 |
| commit | b6ebadaa66ee68b1880c0e10669543d1ba058c18 (patch) | |
| tree | 75506bd02a8186a013b5eb16a425de0c1d96bc71 /mysys | |
| parent | 7d4b2b984779e695d0c233d11173b2965d25ef27 (diff) | |
| parent | fe449affcf99fcf63f620994b544eb96d2504cda (diff) | |
| download | mariadb-git-b6ebadaa66ee68b1880c0e10669543d1ba058c18.tar.gz | |
Merge branch '10.6' into 10.7
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_keycache.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/mysys/mf_keycache.c b/mysys/mf_keycache.c index 2001cb64db0..4b0fef183d2 100644 --- a/mysys/mf_keycache.c +++ b/mysys/mf_keycache.c @@ -1,5 +1,5 @@ /* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2017, MariaDB Corporation. + Copyright (c) 2017, 2022, MariaDB Corporation. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -377,7 +377,7 @@ static void keycache_debug_print(const char *fmt,...); #define KEYCACHE_DBUG_ASSERT(a) DBUG_ASSERT(a) #endif /* defined(KEYCACHE_DEBUG_LOG) && defined(KEYCACHE_DEBUG) */ -#if defined(KEYCACHE_DEBUG) || !defined(DBUG_OFF) +#if defined(KEYCACHE_DEBUG) || defined(DBUG_TRACE) static long keycache_thread_id; #define KEYCACHE_THREAD_TRACE(l) \ KEYCACHE_DBUG_PRINT(l,("|thread %ld",keycache_thread_id)) @@ -393,7 +393,7 @@ static long keycache_thread_id; #define KEYCACHE_THREAD_TRACE_BEGIN(l) #define KEYCACHE_THREAD_TRACE_END(l) #define KEYCACHE_THREAD_TRACE(l) -#endif /* defined(KEYCACHE_DEBUG) || !defined(DBUG_OFF) */ +#endif /* defined(KEYCACHE_DEBUG) || defined(DBUG_TRACE) */ #define BLOCK_NUMBER(b) \ ((uint) (((char*)(b)-(char *) keycache->block_root)/sizeof(BLOCK_LINK))) |