database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Fixed compile failure when we don't use system zlib

Browse Source 
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()
This commit is contained in:
Michael Widenius
2011-06-09 13:35:01 +03:00
parent 163d7acc9f
commit 60bd2133d7
4 changed files with 15 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
client/Makefile.am
View File

@ -24,6 +24,7 @@ endif
INCLUDES = -I$(top_builddir)/include \ INCLUDES = -I$(top_builddir)/include \
-I$(top_srcdir)/include \ -I$(top_srcdir)/include \
-I$(top_srcdir)/regex \ -I$(top_srcdir)/regex \
@ZLIB_INCLUDES@ \
$(openssl_includes) $(openssl_includes)
LIBS = @CLIENT_LIBS@ LIBS = @CLIENT_LIBS@

2
sql/set_var.cc
View File

@ -1288,7 +1288,7 @@ static void fix_query_cache_type(THD *thd, enum_var_type type)
fix_query_cache_size(thd, type); fix_query_cache_size(thd, type);
} }
else if (global_system_variables.query_cache_type == 0) else if (global_system_variables.query_cache_type == 0)
query_cache.disable_query_cache(); query_cache.disable_query_cache(thd);
} }
} }

21
sql/sql_cache.cc
View File

@ -1277,7 +1277,8 @@ ulong Query_cache::resize(ulong query_cache_size_arg)
if (global_system_variables.query_cache_type == 0) if (global_system_variables.query_cache_type == 0)
{ {
my_error(ER_QUERY_CACHE_IS_DISABLED, MYF(0)); if (query_cache_size_arg != 0)
my_error(ER_QUERY_CACHE_IS_DISABLED, MYF(0));
DBUG_RETURN(0); DBUG_RETURN(0);
} }
@ -2318,7 +2319,7 @@ void Query_cache::destroy()
} }
void Query_cache::disable_query_cache(void) void Query_cache::disable_query_cache(THD *thd)
{ {
m_cache_status= DISABLE_REQUEST; m_cache_status= DISABLE_REQUEST;
/* /*
@ -2326,7 +2327,7 @@ void Query_cache::disable_query_cache(void)
try_lock(TRY) will exit immediately if there is lock. try_lock(TRY) will exit immediately if there is lock.
unlock() should free block. unlock() should free block.
*/ */
if (m_requests_in_progress == 0 && !try_lock(current_thd, TRY)) if (m_requests_in_progress == 0 && !try_lock(thd, TRY))
unlock(); unlock();
} }
@ -2346,14 +2347,16 @@ void Query_cache::init()
initialized = 1; initialized = 1;
query_state_map= default_charset_info->state_map; query_state_map= default_charset_info->state_map;
/* /*
If we explicitly turn off query cache from the command line query cache will If we explicitly turn off query cache from the command line query
be disabled for the reminder of the server life time. This is because we cache will be disabled for the reminder of the server life
want to avoid locking the QC specific mutex if query cache isn't going to time. This is because we want to avoid locking the QC specific
be used. mutex if query cache isn't going to be used.
*/ */
if (global_system_variables.query_cache_type == 0) if (global_system_variables.query_cache_type == 0)
query_cache.disable_query_cache(); {
free_cache();
m_cache_status= DISABLED;
}
DBUG_VOID_RETURN; DBUG_VOID_RETURN;
} }

2
sql/sql_cache.h
View File

@ -499,7 +499,7 @@ protected:
void lock_and_suspend(void); void lock_and_suspend(void);
void unlock(void); void unlock(void);
void disable_query_cache(void); void disable_query_cache(THD *thd);
}; };
extern Query_cache query_cache; extern Query_cache query_cache;