summaryrefslogtreecommitdiff
path: root/sql/sql_cache.cc
diff options
context:
space:
mode:
authormonty@mysql.com/narttu.mysql.fi <>2006-11-30 22:00:05 +0200
committermonty@mysql.com/narttu.mysql.fi <>2006-11-30 22:00:05 +0200
commit0a673596a288505374b6232d4e17f08934829767 (patch)
tree731e64ce46a0d46ff8ee40e79504c9a5f12cc25d /sql/sql_cache.cc
parent3a35c30027ed27bf6d2f457168fab2e4ef9e198e (diff)
downloadmariadb-git-0a673596a288505374b6232d4e17f08934829767.tar.gz
Don't abort if we call my_thread_end() multiple times
Fixed new introduced bug in my_time.c
Diffstat (limited to 'sql/sql_cache.cc')
-rw-r--r--sql/sql_cache.cc3
1 files changed, 1 insertions, 2 deletions
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;