1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

Merge 10.2 into 10.3

This commit is contained in:
Marko Mäkelä
2018-09-06 22:35:45 +03:00
177 changed files with 5130 additions and 1322 deletions

View File

@@ -4583,7 +4583,7 @@ void Rdb_binlog_manager::update_slave_gtid_info(
}
}
bool Rdb_dict_manager::init(rocksdb::DB *const rdb_dict,
bool Rdb_dict_manager::init(rocksdb::TransactionDB *const rdb_dict,
Rdb_cf_manager *const cf_manager) {
DBUG_ASSERT(rdb_dict != nullptr);
DBUG_ASSERT(cf_manager != nullptr);
@@ -4657,7 +4657,9 @@ int Rdb_dict_manager::commit(rocksdb::WriteBatch *const batch,
int res = HA_EXIT_SUCCESS;
rocksdb::WriteOptions options;
options.sync = sync;
rocksdb::Status s = m_db->Write(options, batch);
rocksdb::TransactionDBWriteOptimizations optimize;
optimize.skip_concurrency_control = true;
rocksdb::Status s = m_db->Write(options, optimize, batch);
res = !s.ok(); // we return true when something failed
if (res) {
rdb_handle_io_error(s, RDB_IO_ERROR_DICT_COMMIT);