diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2014-09-28 16:43:44 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2014-10-01 23:48:35 +0200 |
| commit | b3469520a1b838f08cbebaa8047f2bd3f58fef89 (patch) | |
| tree | f5d7ea31eb3ee0cbbc3e7625c6601c6516dc5efe /sql/wsrep_hton.cc | |
| parent | eaec266eb16c8f02835f76ac987fca5de4debd51 (diff) | |
| download | mariadb-git-b3469520a1b838f08cbebaa8047f2bd3f58fef89.tar.gz | |
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
Diffstat (limited to 'sql/wsrep_hton.cc')
| -rw-r--r-- | sql/wsrep_hton.cc | 5 |
1 files changed, 3 insertions, 2 deletions
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)) |