summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergei Petrunia <psergey@askmonty.org>2021-10-27 10:13:56 +0300
committerSergei Petrunia <psergey@askmonty.org>2021-10-27 10:51:08 +0300
commit3a9967d7579a31e5a43606d563584335348caaa5 (patch)
treefb332c54387bd04f4a5e1e13e681fc2c36608bf3
parent2ed148c8d7b0133ecd17377587facadc7e76e9e8 (diff)
downloadmariadb-git-3a9967d7579a31e5a43606d563584335348caaa5.tar.gz
Fix compile warning:bb-10.2-tmp
ha_rocksdb.h:459:15: warning: 'table_type' overrides a member function but is not marked 'override' [-Winconsistent-missing-override]
-rw-r--r--storage/rocksdb/ha_rocksdb.h16
1 files 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 {