diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2018-08-28 14:09:04 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2018-08-28 14:09:04 +0300 |
| commit | c930afd47eb68aaa5a6a1000969cef881d3fbb0b (patch) | |
| tree | 9a4eec877a555b32d0fa3edae0052ffd97c5bfe8 /storage/rocksdb/rdb_datadic.h | |
| parent | 55163ba1bdb1a05daadc66c41c959994231b361c (diff) | |
| parent | faa4d8f8c6c12c09541c4733773ac700c5e643cf (diff) | |
| download | mariadb-git-c930afd47eb68aaa5a6a1000969cef881d3fbb0b.tar.gz | |
Merge branch 'merge-myrocks' of github.com:MariaDB/mergetrees into bb-10.2-mariarocks-merge
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
Diffstat (limited to 'storage/rocksdb/rdb_datadic.h')
| -rw-r--r-- | storage/rocksdb/rdb_datadic.h | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/storage/rocksdb/rdb_datadic.h b/storage/rocksdb/rdb_datadic.h index f97c0d08d29..2f699a9cd70 100644 --- a/storage/rocksdb/rdb_datadic.h +++ b/storage/rocksdb/rdb_datadic.h @@ -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); } |