diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-08-18 16:22:05 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-08-25 11:55:12 +0300 |
| commit | 575afea7864f0118464e55fd4435ddcb317ac0e8 (patch) | |
| tree | 59ba87faa4bd95ecceccaf3e1e50fe4967bdb1d2 /storage | |
| parent | fba53e777564704016bbe3a105fa5419c82979a8 (diff) | |
| download | mariadb-git-575afea7864f0118464e55fd4435ddcb317ac0e8.tar.gz | |
MyRocks: Remove todo-#ifdef in Rdb_trx_info_aggregator::process_tran
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 6 |
1 files changed, 1 insertions, 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), |