revision-id: 955233256ee26486dc55ce50e759e05ad88546fc parent(s): 6bea5e9e0f37499a9ff5f54e2e8f7665ec1ac317 committer: Sergei Petrunia branch nick: 10.2-r10 timestamp: 2018-04-19 15:41:13 +0300 message: MyRocks: fix rocksdb.information_schema testcase. "The Store binlog position inside RocksDB" feature is only needed for obtaining binlog position after having restored a MyRocks backup. This is not yet supported in MariaDB, so properly disable it in both places where it is done. --- storage/rocksdb/ha_rocksdb.cc | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 5f19fac..6e9e7ef 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -2079,10 +2079,16 @@ class Rdb_transaction { rollback(); return true; } else { +#ifdef MARIAROCKS_NOT_YET + /* + Storing binlog position inside MyRocks is needed only for restoring + MyRocks from backups. This feature is not supported yet. + */ mysql_bin_log_commit_pos(m_thd, &m_mysql_log_offset, &m_mysql_log_file_name); binlog_manager.update(m_mysql_log_file_name, m_mysql_log_offset, get_write_batch()); +#endif return commit_no_binlog(); } } @@ -3089,7 +3095,11 @@ static int rocksdb_prepare(handlerton* hton, THD* thd, bool prepare_tx) /* We were instructed to prepare the whole transaction, or this is an SQL statement end and autocommit is on */ -#ifdef MARIAROCKS_NOT_YET // Crash-safe slave does not work yet +#ifdef MARIAROCKS_NOT_YET + /* + Storing binlog position inside MyRocks is needed only for restoring + MyRocks from backups. This feature is not supported yet. + */ std::vector<st_slave_gtid_info> slave_gtid_info; my_core::thd_slave_gtid_info(thd, &slave_gtid_info); for (const auto &it : slave_gtid_info) {