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 'bb-10.2-mariarocks' of github.com:MariaDB/server into 10.2

Browse Source 
Conflicts:
	storage/rocksdb/ha_rocksdb.cc
This commit is contained in:
Sergei Petrunia
2017-10-13 14:37:04 +03:00
parent 0507b09402 c52ffbeba9
commit f11eaaa3f6
16 changed files with 120 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
storage/rocksdb/rdb_datadic.h
View File

@@ -1139,7 +1139,6 @@ public:
bool init(Rdb_dict_manager *const dict);
void cleanup();
void update(const char *const binlog_name, const my_off_t binlog_pos,
const char *const binlog_max_gtid,
rocksdb::WriteBatchBase *const batch);
bool read(char *const binlog_name, my_off_t *const binlog_pos,
char *const binlog_gtid) const;