database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge branch '10.0' into 10.1

Browse Source
This commit is contained in:
Sergei Golubchik
2017-08-08 10:18:43 +02:00
parent 2395adfbfd ef2e51c396
commit 8e8d42ddf0
313 changed files with 36802 additions and 2097 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sql/rpl_mi.cc
View File

@ -1,5 +1,5 @@
/* Copyright (c) 2006, 2012, Oracle and/or its affiliates.
Copyright (c) 2010, 2011, Monty Program Ab
/* Copyright (c) 2006, 2017, Oracle and/or its affiliates.
Copyright (c) 2010, 2017, MariaDB Corporation
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@ -844,7 +844,6 @@ void end_master_info(Master_info* mi)
if (!mi->inited)
DBUG_VOID_RETURN;
end_relay_log_info(&mi->rli);
if (mi->fd >= 0)
{
end_io_cache(&mi->file);
@ -883,6 +882,7 @@ void free_key_master_info(Master_info *mi)
/* We use 2 here instead of 1 just to make it easier when debugging */
mi->killed= 2;
end_master_info(mi);
end_relay_log_info(&mi->rli);
mi->unlock_slave_threads();
delete mi;