mirror of
https://github.com/MariaDB/server.git
synced 2025-12-24 11:21:21 +03:00
Merge chilla.local:/home/mydev/mysql-5.1-bug17332-old
into chilla.local:/home/mydev/mysql-5.1-bug17332
sql/handler.cc:
Auto merged
sql/sql_table.cc:
Auto merged
storage/myisam/ha_myisam.cc:
Auto merged
mysys/mf_keycache.c:
Bug#17332 - changing key_buffer_size on a running server
can crash under load
Manual merge
This commit is contained in:
@@ -4571,8 +4571,13 @@ int reassign_keycache_tables(THD *thd, KEY_CACHE *src_cache,
|
||||
bool mysql_preload_keys(THD* thd, TABLE_LIST* tables)
|
||||
{
|
||||
DBUG_ENTER("mysql_preload_keys");
|
||||
/*
|
||||
We cannot allow concurrent inserts. The storage engine reads
|
||||
directly from the index file, bypassing the cache. It could read
|
||||
outdated information if parallel inserts into cache blocks happen.
|
||||
*/
|
||||
DBUG_RETURN(mysql_admin_table(thd, tables, 0,
|
||||
"preload_keys", TL_READ, 0, 0, 0, 0,
|
||||
"preload_keys", TL_READ_NO_INSERT, 0, 0, 0, 0,
|
||||
&handler::preload_keys, 0));
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user