revision-id: 0d1de18e55c41fb10587213ad2c12c2ed7e81f52 (mariadb-10.2.40-117-g0d1de18e55c) parent(s): a441a569157bf75303e3f9f485211c4b5d4f6129 author: Sergei Petrunia committer: Sergei Petrunia timestamp: 2021-10-27 10:13:56 +0300 message: Fix compile warning: ha_rocksdb.h:459:15: warning: 'table_type' overrides a member function but is not marked 'override' [-Winconsistent-missing-override] --- storage/rocksdb/ha_rocksdb.h | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/storage/rocksdb/ha_rocksdb.h b/storage/rocksdb/ha_rocksdb.h index 437c8667994..4a379cd638a 100644 --- a/storage/rocksdb/ha_rocksdb.h +++ b/storage/rocksdb/ha_rocksdb.h @@ -448,15 +448,13 @@ class ha_rocksdb : public my_core::handler { } } - /** @brief - The name that will be used for display purposes. - */ - const char *table_type() const /*override*/ { - DBUG_ENTER_FUNC(); - // MariaDB: this function is not virtual, however ha_innodb - // declares it (and then never uses!) psergey-merge-todo:. - DBUG_RETURN(rocksdb_hton_name); - } + /* + MariaDB: this function: + + const char *table_type() const + + is non-virtual in class handler, so there's no point to override it. + */ /* The following is only used by SHOW KEYS: */ const char *index_type(uint inx) override {