mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-23 15:24:16 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

MariaRocks port: disable more code that synchronizes with the binlog

Browse source
This commit is contained in:
Sergei Petrunia 2016-10-19 13:16:51 +00:00
parent 085fa3e4bc
commit fe0b57dfbe
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
storage/rocksdb/ha_rocksdb.cc
View file

@ -1632,11 +1632,13 @@ public:
} }
else else
{ {
#ifdef MARIAROCKS_NOT_YET
my_core::thd_binlog_pos(m_thd, &m_mysql_log_file_name, my_core::thd_binlog_pos(m_thd, &m_mysql_log_file_name,
&m_mysql_log_offset, &m_mysql_gtid); &m_mysql_log_offset, &m_mysql_gtid);
binlog_manager.update(m_mysql_log_file_name, binlog_manager.update(m_mysql_log_file_name,
m_mysql_log_offset, m_mysql_log_offset,
m_mysql_gtid, get_write_batch()); m_mysql_gtid, get_write_batch());
#endif
return commit_no_binlog(); return commit_no_binlog();
} }
} }
@ -2559,6 +2561,7 @@ static int rocksdb_prepare(handlerton* hton, THD* thd, bool prepare_tx)
{ {
return 1; return 1;
} }
#ifdef MARIAROCKS_NOT_YET // disable prepare/commit
if (prepare_tx || if (prepare_tx ||
(!my_core::thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) { (!my_core::thd_test_options(thd, OPTION_NOT_AUTOCOMMIT | OPTION_BEGIN))) {
/* We were instructed to prepare the whole transaction, or /* We were instructed to prepare the whole transaction, or
@ -2594,7 +2597,7 @@ static int rocksdb_prepare(handlerton* hton, THD* thd, bool prepare_tx)
DEBUG_SYNC(thd, "rocksdb.prepared"); DEBUG_SYNC(thd, "rocksdb.prepared");
} }
#endif
return 0; return 0;
} }
@ -2660,9 +2663,12 @@ static void rdb_xid_from_string(const std::string& src, XID *dst)
Reading last committed binary log info from RocksDB system row. Reading last committed binary log info from RocksDB system row.
The info is needed for crash safe slave/master to work. The info is needed for crash safe slave/master to work.
*/ */
static int rocksdb_recover(handlerton* hton, XID* xid_list, uint len, static int rocksdb_recover(handlerton* hton, XID* xid_list, uint len)
#ifdef MARIAROCKS_NOT_YET
char* binlog_file, my_off_t* binlog_pos) char* binlog_file, my_off_t* binlog_pos)
#endif
{ {
#ifdef MARIAROCKS_NOT_YET
if (binlog_file && binlog_pos) if (binlog_file && binlog_pos)
{ {
char file_buf[FN_REFLEN+1]= {0}; char file_buf[FN_REFLEN+1]= {0};
@ -2683,6 +2689,7 @@ static int rocksdb_recover(handlerton* hton, XID* xid_list, uint len,
} }
} }
} }
#endif
if (len == 0 || xid_list == nullptr) if (len == 0 || xid_list == nullptr)
{ {