summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Golubchik <serg@mariadb.org>2020-04-28 14:45:36 +0200
committerSergei Golubchik <serg@mariadb.org>2020-04-29 18:17:08 +0200
commit8c534bdeb8c50bc1df088feca10ea0585f73a46e (patch)
treeaa7b35220dca1c26924ff5cce1c7ebe4406f8830
parent59880df8cd69e9154ca27c5da8fd8b2cc107c4d4 (diff)
downloadmariadb-git-8c534bdeb8c50bc1df088feca10ea0585f73a46e.tar.gz
cleanup: remove dbug keywords that are never used
-rw-r--r--sql/slave.cc33
1 files changed, 0 insertions, 33 deletions
diff --git a/sql/slave.cc b/sql/slave.cc
index ae1c5ca2cf8..d359e1bdae4 100644
--- a/sql/slave.cc
+++ b/sql/slave.cc
@@ -3048,9 +3048,6 @@ pthread_handler_t handle_slave_io(void *arg)
uint retry_count;
bool suppress_warnings;
int ret;
-#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");
@@ -3182,16 +3179,6 @@ 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_PRINT("info",("Starting reading binary log from master"));
@@ -3208,16 +3195,6 @@ requesting master dump") ||
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;
DBUG_ASSERT(mi->last_error().number == 0);
@@ -3235,16 +3212,6 @@ requesting master dump") ||
if (check_io_slave_killed(thd, mi, "Slave I/O thread killed while \
reading event"))
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)
{