File tree Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Expand file tree Collapse file tree 1 file changed +3
-3
lines changed Original file line number Diff line number Diff line change @@ -2453,7 +2453,7 @@ static Rdb_transaction *get_or_create_tx(THD *thd)
2453
2453
// TODO: this is called too many times.. O(#rows)
2454
2454
if (tx == nullptr )
2455
2455
{
2456
- if (rpl_skip_tx_api_var && thd->rli_slave )
2456
+ if (rpl_skip_tx_api_var && thd->rgi_slave )
2457
2457
tx= new Rdb_writebatch_impl (thd);
2458
2458
else
2459
2459
tx= new Rdb_transaction_impl (thd);
@@ -2531,7 +2531,7 @@ static std::string rdb_xid_to_string(const XID& src)
2531
2531
static bool rocksdb_flush_wal (handlerton* hton __attribute__ ((__unused__)))
2532
2532
#ifdef MARIAROCKS_NOT_YET
2533
2533
ulonglong target_lsn __attribute__ ((__unused__)))
2534
- #else
2534
+ #endif
2535
2535
{
2536
2536
DBUG_ASSERT (rdb != nullptr );
2537
2537
rocksdb::Status s= rdb->SyncWAL ();
@@ -8675,7 +8675,7 @@ int ha_rocksdb::external_lock(THD *thd, int lock_type)
8675
8675
8676
8676
int binlog_format= my_core::thd_binlog_format (thd);
8677
8677
bool unsafe_for_binlog= THDVAR (ha_thd (), unsafe_for_binlog);
8678
- if (lock_type == F_WRLCK && !thd->rli_slave &&
8678
+ if (lock_type == F_WRLCK && !thd->rgi_slave &&
8679
8679
!unsafe_for_binlog &&
8680
8680
binlog_format != BINLOG_FORMAT_ROW &&
8681
8681
binlog_format != BINLOG_FORMAT_UNSPEC &&
You can’t perform that action at this time.
0 commit comments