diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-07-20 08:56:09 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-07-20 08:56:09 +0300 |
| commit | a481de30bb972f055cff088a84a211c1acd5be38 (patch) | |
| tree | 680d500eddf7b51bd2086218a01a42b28efa1f51 /sql/slave.cc | |
| parent | e8a2a751212a04e835b2b03408132ecbbab52410 (diff) | |
| parent | 59fca5806af65c8379a993f9e604cb0b20a76e2b (diff) | |
| download | mariadb-git-a481de30bb972f055cff088a84a211c1acd5be38.tar.gz | |
Merge tag 'mariadb-5.5.57' into 5.5-galera
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index f472825b0a9..f043ea3c477 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -1,5 +1,5 @@ -/* Copyright (c) 2000, 2016, Oracle and/or its affiliates. - Copyright (c) 2009, 2016, MariaDB +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. + Copyright (c) 2009, 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 @@ -883,6 +883,7 @@ void close_active_mi() if (active_mi) { end_master_info(active_mi); + end_relay_log_info(&active_mi->rli); delete active_mi; active_mi= 0; } @@ -4607,6 +4608,7 @@ void end_relay_log_info(Relay_log_info* rli) { DBUG_ENTER("end_relay_log_info"); + rli->error_on_rli_init_info= false; if (!rli->inited) DBUG_VOID_RETURN; if (rli->info_fd >= 0) |