From 346557a957576006bd1745ece1cd3c1b801f0058 Mon Sep 17 00:00:00 2001 From: unknown Date: Thu, 30 Nov 2006 22:00:05 +0200 Subject: Don't abort if we call my_thread_end() multiple times Fixed new introduced bug in my_time.c BitKeeper/deleted/.del-valgrind.supp.orig: Delete: mysql-test/valgrind.supp.orig mysys/my_thr_init.c: More comments Don't abort if we call my_thread_end() multiple times sql-common/my_time.c: Fixed wrong patch in last commit sql/sql_cache.cc: Fixed old bad merge (not critical) sql/tztime.cc: Portability fix --- sql/sql_cache.cc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'sql/sql_cache.cc') diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 3362ec76fc2..01f8184341d 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1039,7 +1039,6 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) while (sql[i]=='(') i++; - /* Test if the query is a SELECT (pre-space is removed in dispatch_command). @@ -1051,7 +1050,7 @@ Query_cache::send_result_to_client(THD *thd, char *sql, uint query_length) if ((my_toupper(system_charset_info, sql[i]) != 'S' || my_toupper(system_charset_info, sql[i + 1]) != 'E' || my_toupper(system_charset_info, sql[i + 2]) != 'L') && - sql[0] != '/') + sql[i] != '/') { DBUG_PRINT("qcache", ("The statement is not a SELECT; Not cached")); goto err; -- cgit v1.2.1