summaryrefslogtreecommitdiff
path: root/sql/sql_cache.cc
diff options
context:
space:
mode:
authorjimw@mysql.com <>2005-05-02 10:19:37 -0700
committerjimw@mysql.com <>2005-05-02 10:19:37 -0700
commit7bab94f36b8334b9de1c1d1afc0a86114939fc61 (patch)
tree64d81ff9452ecfafb3894ee63c2acd7ccf96ce64 /sql/sql_cache.cc
parent1727ac74a31a493c6da95f6dea503740707c89c6 (diff)
parent8e87db93183b1a4787d7cd0fdd89f1a8179bed68 (diff)
downloadmariadb-git-7bab94f36b8334b9de1c1d1afc0a86114939fc61.tar.gz
Clean up merge from 4.1
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 4a4f61f985c..430e0fbcabf 100644
--- a/sql/sql_cache.cc
+++ b/sql/sql_cache.cc
@@ -1950,6 +1950,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*/