diff options
author | unknown <hf@deer.(none)> | 2004-01-07 12:54:28 +0400 |
---|---|---|
committer | unknown <hf@deer.(none)> | 2004-01-07 12:54:28 +0400 |
commit | 690404bdc86c2ec46d7e4a58ab4e09750375b410 (patch) | |
tree | 27b0d37b16405b20cd3fd5d1e8d1125687bcf23a /sql/sql_parse.cc | |
parent | 079b4819a4a08cdf4e54eac802037efeb1e7f772 (diff) | |
parent | 5d90d9406eb23052916482d4b4f76631a507cfe9 (diff) | |
download | mariadb-git-690404bdc86c2ec46d7e4a58ab4e09750375b410.tar.gz |
Merge
libmysqld/lib_sql.cc:
Auto merged
sql/sql_cache.cc:
Auto merged
sql/sql_parse.cc:
SCCS merged
Diffstat (limited to 'sql/sql_parse.cc')
-rw-r--r-- | sql/sql_parse.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_parse.cc b/sql/sql_parse.cc index 465d840e2b8..a6be104730e 100644 --- a/sql/sql_parse.cc +++ b/sql/sql_parse.cc @@ -3877,7 +3877,7 @@ mysql_parse(THD *thd, char *inBuf, uint length) else { mysql_execute_command(thd); - query_cache_end_of_result(&thd->net); + query_cache_end_of_result(thd); } } } |