diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-18 14:59:10 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-18 14:59:10 +0200 |
| commit | 9a5fe1f4ea53f26690bfe2cd4f42050bfccaf4af (patch) | |
| tree | 5456add57977533b445a03d2e03e87ffa7f483d8 /sql/sql_repl.cc | |
| parent | e7fd6ed3875bd91dbd30a62291ae471c35da8fdf (diff) | |
| parent | 34cd74e52185de2ea3156e8295de3c638cde8c88 (diff) | |
| download | mariadb-git-9a5fe1f4ea53f26690bfe2cd4f42050bfccaf4af.tar.gz | |
Merge remote-tracking branch 'mysql/5.5' into 5.5
Diffstat (limited to 'sql/sql_repl.cc')
| -rw-r--r-- | sql/sql_repl.cc | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/sql/sql_repl.cc b/sql/sql_repl.cc index 5aea3f6d0de..871cb27f0d0 100644 --- a/sql/sql_repl.cc +++ b/sql/sql_repl.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. - Copyright (c) 2008, 2014, SkySQL Ab. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. + Copyright (c) 2008, 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 @@ -1487,6 +1487,7 @@ int reset_slave(THD *thd, Master_info* mi) // close master_info_file, relay_log_info_file, set mi->inited=rli->inited=0 end_master_info(mi); + end_relay_log_info(&mi->rli); // and delete these two files fn_format(fname, master_info_file, mysql_data_home, "", 4+32); if (mysql_file_stat(key_file_master_info, fname, &stat_area, MYF(0)) && |