diff options
| author | unknown <jimw@mysql.com> | 2005-05-02 10:19:37 -0700 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-05-02 10:19:37 -0700 |
| commit | 41e7a9709db166842e11d00dd15eb8d1762d3285 (patch) | |
| tree | 64d81ff9452ecfafb3894ee63c2acd7ccf96ce64 /sql/sql_cache.cc | |
| parent | d41aa2976ed430dce3fa9ebff84c8bdddbbb967a (diff) | |
| parent | 9f5a4955d0ccfd27f5338c04e17e5fabd3840616 (diff) | |
| download | mariadb-git-41e7a9709db166842e11d00dd15eb8d1762d3285.tar.gz | |
Clean up merge from 4.1
configure.in:
Auto merged
extra/my_print_defaults.c:
Auto merged
mysql-test/mysql-test-run.sh:
Auto merged
mysql-test/r/lowercase_table.result:
Auto merged
mysql-test/r/query_cache.result:
Mege results
mysql-test/t/lowercase_table.test:
Merge tests
mysql-test/t/query_cache.test:
Merge tests
mysys/default.c:
Merge from 4.1
sql/sql_cache.cc:
Merge
sql/sql_parse.cc:
Merge from 4.1
sql/sql_table.cc:
Merge
tests/mysql_client_test.c:
Merge
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 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*/ |