Skip to content

Commit fe0b57d

Browse files
committed
MariaRocks port: disable more code that synchronizes with the binlog
1 parent 085fa3e commit fe0b57d

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

storage/rocksdb/ha_rocksdb.cc

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1632,11 +1632,13 @@ class Rdb_transaction
16321632
}
16331633
else
16341634
{
1635+
#ifdef MARIAROCKS_NOT_YET
16351636
my_core::thd_binlog_pos(m_thd, &m_mysql_log_file_name,
16361637
&m_mysql_log_offset, &m_mysql_gtid);
16371638
binlog_manager.update(m_mysql_log_file_name,
16381639
m_mysql_log_offset,
16391640
m_mysql_gtid, get_write_batch());
1641+
#endif
16401642
return commit_no_binlog();
16411643
}
16421644
}
@@ -2559,6 +2561,7 @@ static int rocksdb_prepare(handlerton* hton, THD* thd, bool prepare_tx)
25592561
{
25602562
return 1;
25612563
}
2564+
#ifdef MARIAROCKS_NOT_YET // disable prepare/commit
25622565
if (prepare_tx ||
25632566
(!my_core::thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) {
25642567
/* We were instructed to prepare the whole transaction, or
@@ -2594,7 +2597,7 @@ static int rocksdb_prepare(handlerton* hton, THD* thd, bool prepare_tx)
25942597

25952598
DEBUG_SYNC(thd, "rocksdb.prepared");
25962599
}
2597-
2600+
#endif
25982601
return 0;
25992602
}
26002603

@@ -2660,9 +2663,12 @@ static void rdb_xid_from_string(const std::string& src, XID *dst)
26602663
Reading last committed binary log info from RocksDB system row.
26612664
The info is needed for crash safe slave/master to work.
26622665
*/
2663-
static int rocksdb_recover(handlerton* hton, XID* xid_list, uint len,
2666+
static int rocksdb_recover(handlerton* hton, XID* xid_list, uint len)
2667+
#ifdef MARIAROCKS_NOT_YET
26642668
char* binlog_file, my_off_t* binlog_pos)
2669+
#endif
26652670
{
2671+
#ifdef MARIAROCKS_NOT_YET
26662672
if (binlog_file && binlog_pos)
26672673
{
26682674
char file_buf[FN_REFLEN+1]= {0};
@@ -2683,6 +2689,7 @@ static int rocksdb_recover(handlerton* hton, XID* xid_list, uint len,
26832689
}
26842690
}
26852691
}
2692+
#endif
26862693

26872694
if (len == 0 || xid_list == nullptr)
26882695
{

0 commit comments

Comments
 (0)