1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00

database invalidation invalidate queries only of given database (BUG#1898)

mysql-test/r/query_cache.result:
  test of drop database
mysql-test/t/query_cache.test:
  test of drop database
sql/sql_cache.cc:
  database invalidation invalidate queries only of given database
  every freed block header marked as FREE even if it will be merged to make moving & deleting tables block safe
  layout fixed (too long line)
This commit is contained in:
unknown
2003-11-20 18:12:49 +02:00
parent 24bdf95603
commit 03e04c02cd
3 changed files with 41 additions and 8 deletions

View File

@ -1151,9 +1151,29 @@ void Query_cache::invalidate(char *db)
if (query_cache_size > 0)
{
DUMP(this);
/* invalidate_table reduce list while only root of list remain */
while (tables_blocks !=0 )
invalidate_table(tables_blocks);
restart_search:
if (tables_blocks)
{
Query_cache_block *curr= tables_blocks;
Query_cache_block *next;
do
{
next= curr->next;
if (strcmp(db, (char*)(curr->table()->db())) == 0)
invalidate_table(curr);
/*
invalidate_table can freed block on which point 'next' (if
table of this block used only in queries which was deleted
by invalidate_table). As far as we do not allocate new blocks
and mark all headers of freed blocks as 'FREE' (even if they are
merged with other blocks) we can just test type of block
to be sure that block is not deleted
*/
if (next->type == Query_cache_block::FREE)
goto restart_search;
curr= next;
} while (curr != tables_blocks);
}
}
STRUCT_UNLOCK(&structure_guard_mutex);
}
@ -2158,9 +2178,11 @@ void Query_cache::free_memory_block(Query_cache_block *block)
{
DBUG_ENTER("Query_cache::free_memory_block");
block->used=0;
DBUG_PRINT("qcache",("first_block 0x%lx, block 0x%lx, pnext 0x%lx pprev 0x%lx",
(ulong) first_block, (ulong) block,block->pnext,
(ulong) block->pprev));
block->type= Query_cache_block::FREE; // mark block as free in any case
DBUG_PRINT("qcache",
("first_block 0x%lx, block 0x%lx, pnext 0x%lx pprev 0x%lx",
(ulong) first_block, (ulong) block,block->pnext,
(ulong) block->pprev));
if (block->pnext != first_block && block->pnext->is_free())
block = join_free_blocks(block, block->pnext);