5.5 merge

This commit is contained in:
Sergei Golubchik 2014-02-25 16:04:35 +01:00
commit 0b9a0a3517
1431 changed files with 5962 additions and 2175 deletions

View file

@ -1326,6 +1326,7 @@ ulong Query_cache::resize(ulong query_cache_size_arg)
query->unlock_n_destroy();
block= block->next;
} while (block != queries_blocks);
queries_blocks= NULL; // avoid second destroying by free_cache
}
free_cache();