diff options
| author | monty@mysql.com <> | 2004-04-05 13:56:05 +0300 |
|---|---|---|
| committer | monty@mysql.com <> | 2004-04-05 13:56:05 +0300 |
| commit | 42cf92ce37c7ce9b7356d04273a858a9e42823b5 (patch) | |
| tree | 0bfd237ce668df7f8a361ddbc36762c5a16b2bae /sql/sql_cache.cc | |
| parent | 99f712a30bc6fcdb5a71cf349243295458d22074 (diff) | |
| download | mariadb-git-42cf92ce37c7ce9b7356d04273a858a9e42823b5.tar.gz | |
Fixed many compiler warnings
Fixed bugs in group_concat with ORDER BY and DISTINCT (Bugs #2695, #3381 and #3319)
Fixed crash when doing rollback in slave and the io thread catched up with the sql thread
Set locked_in_memory properly
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 39061a6501b..e1a15eff475 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -1860,11 +1860,11 @@ my_bool Query_cache::write_result_data(Query_cache_block **result_block, { // It is success (nobody can prevent us write data) STRUCT_UNLOCK(&structure_guard_mutex); - byte *rest = (byte*) data; - Query_cache_block *block = *result_block; uint headers_len = (ALIGN_SIZE(sizeof(Query_cache_block)) + ALIGN_SIZE(sizeof(Query_cache_result))); #ifndef EMBEDDED_LIBRARY + Query_cache_block *block= *result_block; + byte *rest= (byte*) data; // Now fill list of blocks that created by allocate_data_chain do { |