summaryrefslogtreecommitdiff
path: root/sql/wsrep_mysqld.cc
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2019-03-09 19:48:11 +0400
committerSergey Vojtovich <svoj@mariadb.org>2019-03-09 20:22:24 +0400
commit88d89ee0bae24b71416c2af4f4c2f2be7b6a033a (patch)
treec60993ac487aa97b4fdcc4d7a030a2f8b7d25c93 /sql/wsrep_mysqld.cc
parent5a796f1f41a5bc0afb638cc342095e59a5bb15df (diff)
downloadmariadb-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/wsrep_mysqld.cc')
-rw-r--r--sql/wsrep_mysqld.cc16
1 files changed, 0 insertions, 16 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc
index 68e6a5da098..71d0ca90f4f 100644
--- a/sql/wsrep_mysqld.cc
+++ b/sql/wsrep_mysqld.cc
@@ -2375,22 +2375,6 @@ void wsrep_wait_appliers_close(THD *thd)
*/
}
-void wsrep_kill_mysql(THD *thd)
-{
- if (mysqld_server_started)
- {
- if (!abort_loop)
- {
- WSREP_INFO("starting shutdown");
- kill_mysql(thd);
- }
- }
- else
- {
- unireg_abort(1);
- }
-}
-
void
wsrep_last_committed_id(wsrep_gtid_t* gtid)
{