revision-id: adcfea710ff0dcd8d223d41440225ebf6e64f796 (mariadb-10.4.11-85-gadcfea710ff) parent(s): 2fb881df1d89b27521ac50a6f6f5c1426536e70b author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2020-02-19 14:57:47 +0300 message: Fix compile failure, compare_key_parts in handler shadowed by MyRocks The two functions have different signature. Use "using ..." to prevent shadowing --- storage/rocksdb/ha_rocksdb.h | 1 + 1 file changed, 1 insertion(+) 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 @@ class ha_rocksdb : public my_core::handler { 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__));