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 10.2 into 10.3

Browse Source
This commit is contained in:
Marko Mäkelä
2018-09-06 22:35:45 +03:00
parent 3bfafd133f a0631e7221
commit 2f4c391958
177 changed files with 5130 additions and 1322 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
storage/rocksdb/rdb_datadic.h
View File

@@ -1261,7 +1261,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 */
@@ -1287,7 +1287,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); }