diff options
| author | unknown <monty@hundin.mysql.fi> | 2001-12-10 18:16:51 +0200 |
|---|---|---|
| committer | unknown <monty@hundin.mysql.fi> | 2001-12-10 18:16:51 +0200 |
| commit | 315b8991e3b9ba019e85f6330995295f37b06a6f (patch) | |
| tree | d3472c51c19a0113cf4c0b1d0cf472d60a8a6fcd /sql/sql_cache.cc | |
| parent | f939a6b635846216778bb4abd96ba6fef229908e (diff) | |
| download | mariadb-git-315b8991e3b9ba019e85f6330995295f37b06a6f.tar.gz | |
Portability fixes.
Changed mysql-test-run.sh to test for files to get shorter, more reliable timeouts.
Docs/manual.texi:
Cleaned up SET PASSWORD stuff
client/mysqltest.c:
Do more retrys
mysql-test/mysql-test-run.sh:
Test for files to get shorter timeouts
mysql-test/r/query_cache.result:
Portability fix
mysql-test/t/query_cache.test:
Portability fix
sql/sql_cache.cc:
Safety fix
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 5e07a3529ea..4417af44907 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -2672,6 +2672,7 @@ uint Query_cache::filename_2_table_key (char *key, const char *path) void Query_cache::wreck(uint line, const char *message) { + THD *thd=current_thd; DBUG_ENTER("Query_cache::wreck"); query_cache_size = 0; if (*message) @@ -2679,7 +2680,8 @@ void Query_cache::wreck(uint line, const char *message) DBUG_PRINT("warning", ("==================================")); DBUG_PRINT("warning", ("%5d QUERY CACHE WRECK => DISABLED",line)); DBUG_PRINT("warning", ("==================================")); - current_thd->killed = 1; + if (thd) + thd->killed = 1; bins_dump(); cache_dump(); DBUG_VOID_RETURN; |