diff options
| author | Sergey Vojtovich <svoj@mariadb.org> | 2019-03-09 19:48:11 +0400 |
|---|---|---|
| committer | Sergey Vojtovich <svoj@mariadb.org> | 2019-03-09 20:22:24 +0400 |
| commit | 88d89ee0bae24b71416c2af4f4c2f2be7b6a033a (patch) | |
| tree | c60993ac487aa97b4fdcc4d7a030a2f8b7d25c93 /sql/slave.cc | |
| parent | 5a796f1f41a5bc0afb638cc342095e59a5bb15df (diff) | |
| download | mariadb-git-88d89ee0bae24b71416c2af4f4c2f2be7b6a033a.tar.gz | |
Less abort_loop references
Removed redundant initialisation in unireg_init(): already done by
mysql_init_variables().
Slave threads already check THD::killed, which eliminates the need to
check abort_loop.
Removed unused wsrep_kill_mysql().
Diffstat (limited to 'sql/slave.cc')
| -rw-r--r-- | sql/slave.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sql/slave.cc b/sql/slave.cc index 17a63e94661..f5bfd0f1974 100644 --- a/sql/slave.cc +++ b/sql/slave.cc @@ -510,7 +510,7 @@ handle_slave_background(void *arg __attribute__((unused))) &old_stage); for (;;) { - stop= abort_loop || thd->killed || slave_background_thread_stop; + stop= thd->killed || slave_background_thread_stop; kill_list= slave_background_kill_list; create_list= slave_background_gtid_pos_create_list; pending_deletes= slave_background_gtid_pending_delete_flag; @@ -1474,7 +1474,7 @@ static bool io_slave_killed(Master_info* mi) DBUG_ENTER("io_slave_killed"); DBUG_ASSERT(mi->slave_running); // tracking buffer overrun - DBUG_RETURN(mi->abort_slave || abort_loop || mi->io_thd->killed); + DBUG_RETURN(mi->abort_slave || mi->io_thd->killed); } /** @@ -1499,7 +1499,7 @@ static bool sql_slave_killed(rpl_group_info *rgi) DBUG_ASSERT(rli->sql_driver_thd == thd); DBUG_ASSERT(rli->slave_running == 1);// tracking buffer overrun - if (abort_loop || rli->sql_driver_thd->killed || rli->abort_slave) + if (rli->sql_driver_thd->killed || rli->abort_slave) { /* The transaction should always be binlogged if OPTION_KEEP_LOG is |