diff options
| author | Michael Widenius <monty@askmonty.org> | 2011-06-09 13:35:01 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2011-06-09 13:35:01 +0300 |
| commit | 60bd2133d70628754bf08f4256412f709c99fb0d (patch) | |
| tree | 843395302605eeab81c8ea27af3421ed4c07c4e4 /client | |
| parent | 163d7acc9ff619c1a0f6da01abb5cf7cc11483f2 (diff) | |
| download | mariadb-git-60bd2133d70628754bf08f4256412f709c99fb0d.tar.gz | |
Fixed compile failure when we don't use system zlib
Fixed crash when setting query_cache_type to 0.
client/Makefile.am:
Added zlib include (needed by checksum.c)
sql/set_var.cc:
Updated call to disable_query_cache()
sql/sql_cache.cc:
Don't give warning if we start mysqld with --query_cache_type=0 --query_cache-size=0
Fixed crash when setting query_cache_type to 0 (we shouldn't call query_cache.disable_query_cache() when there is no current_thd)
sql/sql_cache.h:
Added THD to disable_query_cache()
Diffstat (limited to 'client')
| -rw-r--r-- | client/Makefile.am | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/client/Makefile.am b/client/Makefile.am index 8abf33dc3e2..b71b180d98d 100644 --- a/client/Makefile.am +++ b/client/Makefile.am @@ -24,6 +24,7 @@ endif INCLUDES = -I$(top_builddir)/include \ -I$(top_srcdir)/include \ -I$(top_srcdir)/regex \ + @ZLIB_INCLUDES@ \ $(openssl_includes) LIBS = @CLIENT_LIBS@ |