database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

MDEV-8345 STOP SLAVE should not cause an ERROR to be logged to the error log

Browse Source 
cherry-pick from 5.7:
  commit 6b24763
  Author: Manish Kumar <manish.4.kumar@oracle.com>
  Date:   Tue Mar 27 13:10:42 2012 +0530

  BUG#12977988 - ON STOP SLAVE: ERROR READING PACKET FROM SERVER: LOST CONNECTION
                 TO MYSQL SERVER
  BUG#11761457 - ERROR 2013 + "ERROR READING RELAY LOG EVENT" ON STOP SLAVEBUG#12977988 - ON STOP SLAVE: ERROR READING PACKET FROM SERVER: LOST CONNECTION
               TO MYSQL SERVER
This commit is contained in:
Sergei Golubchik
2016-10-26 13:26:43 +02:00
parent 25932708b1
commit 22490a0d70
4 changed files with 31 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
mysql-test/suite/rpl/r/rpl_stop_slave_error.result Normal file
View File

@@ -0,0 +1,6 @@
include/master-slave.inc
[connection master]
include/stop_slave.inc
NOT FOUND /Error reading packet from server: Lost connection/ in slave_log.err
include/start_slave.inc
include/rpl_end.inc

1
mysql-test/suite/rpl/t/rpl_stop_slave_error-slave.opt Normal file
View File

@@ -0,0 +1 @@
--log-error=$MYSQLTEST_VARDIR/tmp/slave_log.err

17
mysql-test/suite/rpl/t/rpl_stop_slave_error.test Normal file
View File

@@ -0,0 +1,17 @@
#
# MDEV-8345 STOP SLAVE should not cause an ERROR to be logged to the error log
#
source include/have_binlog_format_mixed.inc; # don't repeat the test three times
source include/master-slave.inc;
connection master;
sync_slave_with_master;
source include/stop_slave.inc;
let SEARCH_FILE=$MYSQLTEST_VARDIR/tmp/slave_log.err;
let SEARCH_PATTERN=Error reading packet from server: Lost connection;
let SEARCH_RANGE= -50000;
source include/search_pattern_in_file.inc;
source include/start_slave.inc;
source include/rpl_end.inc;

7
sql/slave.cc
View File

@@ -3120,8 +3120,13 @@ static ulong read_event(MYSQL* mysql, Master_info *mi, bool* suppress_warnings)
*suppress_warnings= TRUE; *suppress_warnings= TRUE;
} }
else else
sql_print_error("Error reading packet from server: %s ( server_errno=%d)", {
if (!mi->rli.abort_slave)
{
sql_print_error("Error reading packet from server: %s (server_errno=%d)",
mysql_error(mysql), mysql_errno(mysql)); mysql_error(mysql), mysql_errno(mysql));
}
}
DBUG_RETURN(packet_error); DBUG_RETURN(packet_error);
} }