1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00

Merge bk-internal.mysql.com:/home/bk/mysql-5.0

into  bodhi.local:/opt/local/work/mysql-5.1-runtime-merge
This commit is contained in:
kostja@bodhi.local
2006-11-30 02:36:18 +03:00
20 changed files with 739 additions and 140 deletions

View File

@ -737,7 +737,11 @@ void query_cache_end_of_result(THD *thd)
header->query()));
query_cache.wreck(__LINE__, "");
BLOCK_UNLOCK_WR(query_block);
/*
We do not need call of BLOCK_UNLOCK_WR(query_block); here because
query_cache.wreck() switched query cache off but left content
untouched for investigation (it is debugging method).
*/
goto end;
}
#endif
@ -3523,7 +3527,7 @@ uint Query_cache::filename_2_table_key (char *key, const char *path,
#if defined(DBUG_OFF) && !defined(USE_QUERY_CACHE_INTEGRITY_CHECK)
void wreck(uint line, const char *message) {}
void wreck(uint line, const char *message) { query_cache_size = 0; }
void bins_dump() {}
void cache_dump() {}
void queries_dump() {}
@ -3535,6 +3539,17 @@ my_bool in_blocks(Query_cache_block * point) { return 0; }
#else
/*
Debug method which switch query cache off but left content for
investigation.
SYNOPSIS
Query_cache::wreck()
line line of the wreck() call
message message for logging
*/
void Query_cache::wreck(uint line, const char *message)
{
THD *thd=current_thd;