diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-08-17 11:32:16 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-08-17 11:38:34 +0200 |
| commit | cb1e76e4de120d20064a96be4fcc245c3d22bd78 (patch) | |
| tree | 29d130592e3dfea50251771979fbaa6923d44ba9 /sql/sql_repl.cc | |
| parent | a4885dde4ccec68bbb0268796f62e68e08ba4837 (diff) | |
| parent | 48fe832650ae2dc0c2eaa957abfa959b0a2670aa (diff) | |
| download | mariadb-git-cb1e76e4de120d20064a96be4fcc245c3d22bd78.tar.gz | |
Merge branch '10.1' into 10.2
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 e312e9f35e4..e3a082b680d 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 @@ -3342,6 +3342,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 create_logfile_name_with_suffix(master_info_file_tmp, sizeof(master_info_file_tmp), |