summaryrefslogtreecommitdiff
path: root/sql/sql_cache.cc
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-03-31 19:17:45 -0800
committerjimw@mysql.com <>2005-03-31 19:17:45 -0800
commit1476213e52cdf26cf0db4e3d5b07a87f5bfb6605 (patch)
tree046d9ad3bbf129292636ad08e19e842f8417d8a0 /sql/sql_cache.cc
parent026dbe3a388fa0fed2f700876d69a8eaf6a063ab (diff)
downloadmariadb-git-1476213e52cdf26cf0db4e3d5b07a87f5bfb6605.tar.gz
Fix crash in embedded server due to incorrect storage of results
in the query cache. (Bug #9549)
Diffstat (limited to 'sql/sql_cache.cc')
-rw-r--r--sql/sql_cache.cc5
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc
index 6eff958257b..8deb3489782 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -1933,6 +1933,11 @@ my_bool Query_cache::write_result_data(Query_cache_block **result_block,
type = Query_cache_block::RES_CONT;
} while (block != *result_block);
#else
+ /*
+ Set type of first block, emb_store_querycache_result() will handle
+ the others.
+ */
+ (*result_block)->type= type;
Querycache_stream qs(*result_block, headers_len);
emb_store_querycache_result(&qs, (THD*)data);
#endif /*!EMBEDDED_LIBRARY*/