From 575afea7864f0118464e55fd4435ddcb317ac0e8 Mon Sep 17 00:00:00 2001 From: Sergei Petrunia Date: Fri, 18 Aug 2017 16:22:05 +0300 Subject: [PATCH] MyRocks: Remove todo-#ifdef in Rdb_trx_info_aggregator::process_tran --- storage/rocksdb/ha_rocksdb.cc | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index bfc7ffd921c..31bece23cd4 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -3143,11 +3143,7 @@ public: const auto state_it = state_map.find(rdb_trx->GetState()); DBUG_ASSERT(state_it != state_map.end()); -#ifdef MARIAROCKS_NOT_YET - const int is_replication = (thd->rli_slave != nullptr); -#else - const int is_replication= false; -#endif + const int is_replication = (thd->rgi_slave != nullptr); uint32_t waiting_cf_id; std::string waiting_key; rdb_trx->GetWaitingTxns(&waiting_cf_id, &waiting_key),