diff options
| author | Monty <monty@mariadb.org> | 2016-04-28 17:15:38 +0300 |
|---|---|---|
| committer | Monty <monty@mariadb.org> | 2016-04-28 17:15:38 +0300 |
| commit | 636bb59034fd13d2e1b27af42adbb01ddeb3bd82 (patch) | |
| tree | 476c6baee07e742b5c50a2786e1246f29b1a63cb /sql/sql_cache.cc | |
| parent | 32d3d9f7dffa8ef96e6268b53f35453da2f6484d (diff) | |
| download | mariadb-git-636bb59034fd13d2e1b27af42adbb01ddeb3bd82.tar.gz | |
Final fixes for Memory_used
- Change some static variables to dynamic to ensure that we don't do any memory
allocations before server starts or stops
- Print more memory information on SIGHUP. Fixed output.
- Write out if memory was lost if run with --debug-at-exit
- Fixed wrong #ifdef in sql_cache.cc
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 91dd8ad7325..42b80d9b143 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -354,7 +354,7 @@ const uchar *query_state_map; #include "emb_qcache.h" #endif -#if !defined(EXTRA_DBUG) && !defined(DBUG_OFF) +#if defined(EXTRA_DEBUG) && !defined(DBUG_OFF) #define RW_WLOCK(M) {DBUG_PRINT("lock", ("rwlock wlock 0x%lx",(ulong)(M))); \ if (!mysql_rwlock_wrlock(M)) DBUG_PRINT("lock", ("rwlock wlock ok")); \ else DBUG_PRINT("lock", ("rwlock wlock FAILED %d", errno)); } |