diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-05-27 23:10:55 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-05-27 23:10:55 +0200 |
| commit | c2a7dffc573f311029ed4696fb5bd88e5efba752 (patch) | |
| tree | 9f04258d84a42954afb0b8e36486fd6f303cf90d /sql/slave.cc | |
| parent | 520c3f69a6caed5524d3214a0339736d673c4c0c (diff) | |
| parent | f20c63264ab4170fc8e45093042bd2e7272ce9fc (diff) | |
| download | mariadb-git-10.0.tar.gz | |
Merge tag 'mariadb-5.5.68' into 10.0bb-10.0-serg10.0
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 34 |
1 files changed, 1 insertions, 33 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 39e630824df..9c05fa1a404 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -3860,9 +3860,6 @@ pthread_handler_t handle_slave_io(void *arg) bool suppress_warnings; int ret; rpl_io_thread_info io_info; -#ifndef DBUG_OFF - uint retry_count_reg= 0, retry_count_dump= 0, retry_count_event= 0; -#endif // needs to call my_thread_init(), otherwise we get a coredump in DBUG_ stuff my_thread_init(); DBUG_ENTER("handle_slave_io"); @@ -4043,16 +4040,7 @@ connected: goto err; goto connected; } - DBUG_EXECUTE_IF("FORCE_SLAVE_TO_RECONNECT_REG", - if (!retry_count_reg) - { - retry_count_reg++; - sql_print_information("Forcing to reconnect slave I/O thread"); - if (try_to_reconnect(thd, mysql, mi, &retry_count, suppress_warnings, - reconnect_messages[SLAVE_RECON_ACT_REG])) - goto err; - goto connected; - }); + DBUG_EXECUTE_IF("fail_com_register_slave", goto err;); } DBUG_PRINT("info",("Starting reading binary log from master")); @@ -4068,16 +4056,6 @@ connected: goto err; goto connected; } - DBUG_EXECUTE_IF("FORCE_SLAVE_TO_RECONNECT_DUMP", - if (!retry_count_dump) - { - retry_count_dump++; - sql_print_information("Forcing to reconnect slave I/O thread"); - if (try_to_reconnect(thd, mysql, mi, &retry_count, suppress_warnings, - reconnect_messages[SLAVE_RECON_ACT_DUMP])) - goto err; - goto connected; - }); const char *event_buf; mi->slave_running= MYSQL_SLAVE_RUN_READING; @@ -4095,16 +4073,6 @@ connected: event_len= read_event(mysql, mi, &suppress_warnings); if (check_io_slave_killed(mi, NullS)) goto err; - DBUG_EXECUTE_IF("FORCE_SLAVE_TO_RECONNECT_EVENT", - if (!retry_count_event) - { - retry_count_event++; - sql_print_information("Forcing to reconnect slave I/O thread"); - if (try_to_reconnect(thd, mysql, mi, &retry_count, suppress_warnings, - reconnect_messages[SLAVE_RECON_ACT_EVENT])) - goto err; - goto connected; - }); if (event_len == packet_error) { |