Skip to content

Commit 085fa3e

Browse files
committed
MariaRocks port: rli_slave is called rgi_slave in MariaDB.
1 parent e951fd1 commit 085fa3e

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

storage/rocksdb/ha_rocksdb.cc

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2453,7 +2453,7 @@ static Rdb_transaction *get_or_create_tx(THD *thd)
24532453
// TODO: this is called too many times.. O(#rows)
24542454
if (tx == nullptr)
24552455
{
2456-
if (rpl_skip_tx_api_var && thd->rli_slave)
2456+
if (rpl_skip_tx_api_var && thd->rgi_slave)
24572457
tx= new Rdb_writebatch_impl(thd);
24582458
else
24592459
tx= new Rdb_transaction_impl(thd);
@@ -2531,7 +2531,7 @@ static std::string rdb_xid_to_string(const XID& src)
25312531
static bool rocksdb_flush_wal(handlerton* hton __attribute__((__unused__)))
25322532
#ifdef MARIAROCKS_NOT_YET
25332533
ulonglong target_lsn __attribute__((__unused__)))
2534-
#else
2534+
#endif
25352535
{
25362536
DBUG_ASSERT(rdb != nullptr);
25372537
rocksdb::Status s= rdb->SyncWAL();
@@ -8675,7 +8675,7 @@ int ha_rocksdb::external_lock(THD *thd, int lock_type)
86758675

86768676
int binlog_format= my_core::thd_binlog_format(thd);
86778677
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 &&
86798679
!unsafe_for_binlog &&
86808680
binlog_format != BINLOG_FORMAT_ROW &&
86818681
binlog_format != BINLOG_FORMAT_UNSPEC &&

0 commit comments

Comments
 (0)