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 remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2017-06-15 15:27:11 +04:00
parent 3b1921c714 e813fe8622
commit 765347384a
629 changed files with 14636 additions and 11051 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_reload.cc
View File

@ -181,8 +181,12 @@ bool reload_acl_and_cache(THD *thd, unsigned long long options,
slave is not likely to have the same connection names.
*/
tmp_write_to_binlog= 0;
if (!(mi= (get_master_info(&connection_name,
if (connection_name.length == 0)
{
if (master_info_index->flush_all_relay_logs())
*write_to_binlog= -1;
}
else if (!(mi= (get_master_info(&connection_name,
Sql_condition::WARN_LEVEL_ERROR))))
{
result= 1;