mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-15 19:37:16 +02:00
Code Issues Projects Releases Packages Wiki 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
commit c930afd47e
133 changed files with 4308 additions and 639 deletions
Download patch file Download diff file Expand all files Collapse all files

5
storage/rocksdb/rdb_datadic.h
View file

@ -1257,7 +1257,7 @@ private:
class Rdb_dict_manager {
private:
mysql_mutex_t m_mutex;
rocksdb::DB *m_db = nullptr;
rocksdb::TransactionDB *m_db = nullptr;
rocksdb::ColumnFamilyHandle *m_system_cfh = nullptr;
/* Utility to put INDEX_INFO and CF_DEFINITION */
@ -1283,7 +1283,8 @@ public:
Rdb_dict_manager &operator=(const Rdb_dict_manager &) = delete;
Rdb_dict_manager() = default;
bool init(rocksdb::DB *const rdb_dict, Rdb_cf_manager *const cf_manager);
bool init(rocksdb::TransactionDB *const rdb_dict,
Rdb_cf_manager *const cf_manager);
inline void cleanup() { mysql_mutex_destroy(&m_mutex); }