diff options
author | Jonathan Perkin <jperkin@sun.com> | 2008-07-17 17:35:05 +0200 |
---|---|---|
committer | mysqldev <mysqldev@production.mysql.com> | 2008-07-17 17:35:05 +0200 |
commit | a07bb6c47ac5c2a4a3dbd738d9efd39837be0092 (patch) | |
tree | 2adbbe973fd52e717a06d246888fa7f8f5ae8461 /sql/sql_parse.cc | |
parent | 9ee2262c9d815c266fc9d9bb69ab144dcc593a82 (diff) | |
parent | 3bcbaf6cbf18dc04ee2495cc6cd2bf8aa399ebb5 (diff) | |
download | mariadb-git-a07bb6c47ac5c2a4a3dbd738d9efd39837be0092.tar.gz |
Merge from mysql-5.0.66-release
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r-- | sql/sql_parse.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index ab2099d932c..e81988617a6 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -6224,6 +6224,11 @@ void mysql_parse(THD *thd, const char *inBuf, uint length, (thd->query_length= (ulong)(lip.found_semicolon - thd->query))) thd->query_length--; /* Actually execute the query */ + if (*found_semicolon) + { + lex->safe_to_cache_query= 0; + thd->server_status|= SERVER_MORE_RESULTS_EXISTS; + } lex->set_trg_event_type_for_tables(); mysql_execute_command(thd); query_cache_end_of_result(thd); |