diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-03-11 17:52:49 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-03-11 17:52:49 +0100 |
commit | fad47df9957d754bec12d4d327c77ae04f71d903 (patch) | |
tree | 58aaf6077adcb0bc0003228d30bed59687527650 /storage/rocksdb | |
parent | 9d7ed94f6a526748eff29dae2939a3fd341f118b (diff) | |
parent | b7362d5fbc37dec340aeacd1fb0967c4226c022a (diff) | |
download | mariadb-git-fad47df9957d754bec12d4d327c77ae04f71d903.tar.gz |
Merge branch '10.4' into 10.5
Diffstat (limited to 'storage/rocksdb')
-rw-r--r-- | storage/rocksdb/ha_rocksdb.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/rocksdb/ha_rocksdb.h b/storage/rocksdb/ha_rocksdb.h index 1abdc345527..448900c5a91 100644 --- a/storage/rocksdb/ha_rocksdb.h +++ b/storage/rocksdb/ha_rocksdb.h @@ -739,6 +739,7 @@ public: const TABLE *old_table_arg, const Rdb_tbl_def *old_tbl_def_arg) const MY_ATTRIBUTE((__nonnull__)); + using handler::compare_key_parts; int compare_key_parts(const KEY *const old_key, const KEY *const new_key) const MY_ATTRIBUTE((__nonnull__, __warn_unused_result__)); |