mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-04-23 08:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

MDEV-6616 Server crashes in my_hash_first if shutdown is performed when FLUSH LOGS is running

Browse source 
master_info_index becomes zero during shutdown.
check that it's valid (under a mutex) before dereferencing.
This commit is contained in:
Sergei Golubchik 2014-09-06 08:33:56 +02:00
commit 3da761912a
6 changed files with 61 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/item_func.cc
View file

@ -3961,9 +3961,13 @@ longlong Item_master_pos_wait::val_int()
else
connection_name= thd->variables.default_master_connection;
if (!(mi= master_info_index->get_master_info(&connection_name,
Sql_condition::WARN_LEVEL_WARN)))
mysql_mutex_lock(&LOCK_active_mi);
mi= master_info_index->get_master_info(&connection_name,
Sql_condition::WARN_LEVEL_WARN);
mysql_mutex_unlock(&LOCK_active_mi);
if (!mi)
goto err;
if ((event_count = mi->rli.wait_for_pos(thd, log_name, pos, timeout)) == -2)
{
null_value = 1;