summaryrefslogtreecommitdiff
path: root/sql/sql_parse.cc
diff options
context:
space:
mode:
authorGeorgi Kodinov <kgeorge@mysql.com>2008-07-09 12:59:28 +0300
committerGeorgi Kodinov <kgeorge@mysql.com>2008-07-09 12:59:28 +0300
commitfbfef628bc7cbe50fa08a1ee639ee4d8872c9770 (patch)
tree5b0f47c0d1b3cdbcb36db705cc6ca05e4923b85f /sql/sql_parse.cc
parent0d62f60b810ef6e23774734aa3c60131d00d578e (diff)
parentb93fcb9b0ed5458802159cd8cc25d2e7d6e7b3c7 (diff)
downloadmariadb-git-fbfef628bc7cbe50fa08a1ee639ee4d8872c9770.tar.gz
automatic merge of 5.0-bugteam into the 5.0.66 release clone.
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r--sql/sql_parse.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc
index 98e04e45bdd..62a5a79a833 100644
--- a/sql/sql_parse.cc
+++ b/sql/sql_parse.cc
@@ -6169,6 +6169,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);