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/rpl_mi.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/rpl_mi.cc')
| -rw-r--r-- | sql/rpl_mi.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/rpl_mi.cc b/sql/rpl_mi.cc index 13284308f04..adaa7cf864f 100644 --- a/sql/rpl_mi.cc +++ b/sql/rpl_mi.cc @@ -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 @@ -548,7 +548,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); |