diff options
| author | unknown <jimw@mysql.com> | 2005-03-31 19:17:45 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-03-31 19:17:45 -0800 |
| commit | e7332e64ca5ef7208846488935a2249285212f91 (patch) | |
| tree | 046d9ad3bbf129292636ad08e19e842f8417d8a0 /sql/sql_cache.cc | |
| parent | ab77d7d7633a2cff057b17ec43233d4f0d0b0822 (diff) | |
| download | mariadb-git-e7332e64ca5ef7208846488935a2249285212f91.tar.gz | |
Fix crash in embedded server due to incorrect storage of results
in the query cache. (Bug #9549)
libmysqld/emb_qcache.h:
Fix Querycache_stream::use_next_block() to actually use the next
block and mark blocks as used when it writes to them.
mysql-test/r/query_cache.result:
Update results.
mysql-test/t/query_cache.test:
Add new regression test.
libmysqld/emb_qcache.cc:
Fix calls to use_next_block() to indicate whether we are writing
to the next block or not.
sql/sql_cache.cc:
Initialize the first block properly when storing a result in
the embedded server.
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 5 |
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*/ |