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

Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-mariarocks-merge

Browse Source 
Move up-to this revision in the upstream:

  commit de1e8c7bfe7c875ea284b55040e8f3cd3a56fcc2
  Author: Abhinav Sharma <abhinavsharma@fb.com>
  Date:   Thu Aug 23 14:34:39 2018 -0700

      Log updates to semi-sync whitelist in the error log

      Summary:
      Plugin variable changes are not logged in the error log even when
      log_global_var_changes is enabled. Logging updates to whitelist will help in
      debugging.

      Reviewed By: guokeno0

      Differential Revision: D9483807

      fbshipit-source-id: e111cda773d
This commit is contained in:
Sergei Petrunia
2018-08-28 14:09:04 +03:00
parent 55163ba1bd faa4d8f8c6
commit c930afd47e
133 changed files with 4308 additions and 639 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
storage/rocksdb/rdb_datadic.cc
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);