1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

cleanup: remove dbug keywords that are never used

Browse Source
This commit is contained in:
Sergei Golubchik 2020-04-28 14:45:36 +02:00
parent 59880df8cd
commit 8c534bdeb8
1 changed files with 0 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
sql/slave.cc
View File

@ -3048,9 +3048,6 @@ pthread_handler_t handle_slave_io(void *arg)
uint retry_count; uint retry_count;
bool suppress_warnings; bool suppress_warnings;
int ret; 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 // needs to call my_thread_init(), otherwise we get a coredump in DBUG_ stuff
my_thread_init(); my_thread_init();
DBUG_ENTER("handle_slave_io"); DBUG_ENTER("handle_slave_io");
@ -3182,16 +3179,6 @@ connected:
goto err; goto err;
goto connected; 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")); DBUG_PRINT("info",("Starting reading binary log from master"));
@ -3208,16 +3195,6 @@ requesting master dump") ||
goto err; goto err;
goto connected; 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; const char *event_buf;
DBUG_ASSERT(mi->last_error().number == 0); 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 \ if (check_io_slave_killed(thd, mi, "Slave I/O thread killed while \
reading event")) reading event"))
goto err; 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) if (event_len == packet_error)
{ {