From b3469520a1b838f08cbebaa8047f2bd3f58fef89 Mon Sep 17 00:00:00 2001 From: Sergei Golubchik Date: Sun, 28 Sep 2014 16:43:44 +0200 Subject: cleanup: remove OPT_WSREP_START_POSITION and OPT_WSREP_SST_AUTH there is no reason to initialize wsrep start position and auth from inside the get_one_option() callback --- sql/wsrep_hton.cc | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'sql/wsrep_hton.cc') diff --git a/sql/wsrep_hton.cc b/sql/wsrep_hton.cc index 96f1431a82f..4fc9ce2bce2 100644 --- a/sql/wsrep_hton.cc +++ b/sql/wsrep_hton.cc @@ -66,10 +66,11 @@ handlerton *wsrep_hton; */ void wsrep_register_hton(THD* thd, bool all) { - if (thd->wsrep_exec_mode != TOTAL_ORDER && !thd->wsrep_apply_toi) + if (WSREP(thd) && thd->wsrep_exec_mode != TOTAL_ORDER && + !thd->wsrep_apply_toi) { THD_TRANS *trans=all ? &thd->transaction.all : &thd->transaction.stmt; - for (Ha_trx_info *i= trans->ha_list; WSREP(thd) && i; i = i->next()) + for (Ha_trx_info *i= trans->ha_list; i; i = i->next()) { if ((i->ht()->db_type == DB_TYPE_INNODB) || (i->ht()->db_type == DB_TYPE_TOKUDB)) -- cgit v1.2.1