diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2016-11-02 13:44:07 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2016-11-02 13:44:07 +0100 |
| commit | a98c85bb501e9021c0d8d509b8c040611d4c0c3a (patch) | |
| tree | 61dc69fc1cbf886aee6c2934e8efc6b57c3462bb /sql/slave.cc | |
| parent | c18054deb2b5cfcf1f13aa71574406f2bafb87c6 (diff) | |
| parent | 7196691b44b65e12cb5cca6f17c8d0f091eb443f (diff) | |
| download | mariadb-git-a98c85bb501e9021c0d8d509b8c040611d4c0c3a.tar.gz | |
Merge branch '10.0-galera' into 10.1
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index a55d26b1aa0..fa82cf84b5f 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3320,8 +3320,13 @@ static ulong read_event(MYSQL* mysql, Master_info *mi, bool* suppress_warnings) *suppress_warnings= TRUE; } else - sql_print_error("Error reading packet from server: %s ( server_errno=%d)", - mysql_error(mysql), mysql_errno(mysql)); + { + if (!mi->rli.abort_slave) + { + sql_print_error("Error reading packet from server: %s (server_errno=%d)", + mysql_error(mysql), mysql_errno(mysql)); + } + } DBUG_RETURN(packet_error); } |