diff options
| author | Sergei Petrunia <psergey@askmonty.org> | 2017-10-13 14:37:04 +0300 |
|---|---|---|
| committer | Sergei Petrunia <psergey@askmonty.org> | 2017-10-13 14:37:04 +0300 |
| commit | f11eaaa3f6fc28834a7758100e1c0daeccedd972 (patch) | |
| tree | af95c025d20bb597f67d715335cf3cb65a444fbf /storage/rocksdb/rdb_datadic.h | |
| parent | 0507b09402b2bb80aa3a06135b1a94670e7f675f (diff) | |
| parent | c52ffbeba9e90fb5df04de450406734f2abc89be (diff) | |
| download | mariadb-git-f11eaaa3f6fc28834a7758100e1c0daeccedd972.tar.gz | |
Merge branch 'bb-10.2-mariarocks' of github.com:MariaDB/server into 10.2
Conflicts:
storage/rocksdb/ha_rocksdb.cc
Diffstat (limited to 'storage/rocksdb/rdb_datadic.h')
| -rw-r--r-- | storage/rocksdb/rdb_datadic.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/storage/rocksdb/rdb_datadic.h b/storage/rocksdb/rdb_datadic.h index 41747eb885c..b1ecef045d1 100644 --- a/storage/rocksdb/rdb_datadic.h +++ b/storage/rocksdb/rdb_datadic.h @@ -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; |