diff options
| author | unknown <gluh@gluh.mysql.r18.ru> | 2004-04-05 19:14:31 +0500 |
|---|---|---|
| committer | unknown <gluh@gluh.mysql.r18.ru> | 2004-04-05 19:14:31 +0500 |
| commit | 66de313563a74099d416767fec884ab590530d31 (patch) | |
| tree | 7d76f49148e3ca862c1ca481ac7ed91bf5d117d8 /sql/sql_cache.cc | |
| parent | 8c06c8c01025668cdfa6ae66f25060b012ef2347 (diff) | |
| parent | 829902b028765b0f17927ea72d35b020f6d8afad (diff) | |
| download | mariadb-git-66de313563a74099d416767fec884ab590530d31.tar.gz | |
Merge sgluhov@bk-internal.mysql.com:/home/bk/mysql-4.1
into gluh.mysql.r18.ru:/home/gluh/mysql-4.1.curr
sql/sql_yacc.yy:
Auto merged
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 { |