diff options
| author | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 22:47:29 +0100 |
|---|---|---|
| committer | Sergei Golubchik <sergii@pisem.net> | 2013-02-28 22:47:29 +0100 |
| commit | 213f1c76a038ad0e6111cd5eb6b0da9b4b9dc45a (patch) | |
| tree | 79e9a941a078d73ce85da0241871a863fa4eca38 /sql/sql_cache.cc | |
| parent | cfa94b4338b5dd5578436df0402b2f2210de3eaa (diff) | |
| parent | c4341d50950224bb4e976fd1aac23dddc7d78f71 (diff) | |
| download | mariadb-git-213f1c76a038ad0e6111cd5eb6b0da9b4b9dc45a.tar.gz | |
5.3->5.5 merge
Diffstat (limited to 'sql/sql_cache.cc')
| -rw-r--r-- | sql/sql_cache.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/sql/sql_cache.cc b/sql/sql_cache.cc index 0d28e9adb6f..016973ab51a 100644 --- a/sql/sql_cache.cc +++ b/sql/sql_cache.cc @@ -4287,13 +4287,13 @@ my_bool Query_cache::move_by_type(uchar **border, case Query_cache_block::RES_CONT: case Query_cache_block::RESULT: { - DBUG_PRINT("qcache", ("block 0x%lx RES* (%d)", (ulong) block,
- (int) block->type));
- if (*border == 0)
- break;
- Query_cache_block *query_block= block->result()->parent();
- BLOCK_LOCK_WR(query_block);
- Query_cache_block *next= block->next, *prev= block->prev;
+ DBUG_PRINT("qcache", ("block 0x%lx RES* (%d)", (ulong) block, + (int) block->type)); + if (*border == 0) + break; + Query_cache_block *query_block= block->result()->parent(); + BLOCK_LOCK_WR(query_block); + Query_cache_block *next= block->next, *prev= block->prev; Query_cache_block::block_type type= block->type; ulong len = block->length, used = block->used; Query_cache_block *pprev = block->pprev, |