Fix compilation 2 (GCC 9)

Fixed warning: -Woverloaded-virtual for GCC 9 (Clang treats it differently) Caused by c9cba59
MariaDB · Oct 10, 2019 · 545c545 · 545c545
1 parent 3c78d1b
commit 545c545
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/sql/ha_partition.h b/sql/ha_partition.h
@@ -373,6 +373,11 @@ class ha_partition :public handler
   MY_BITMAP m_locked_partitions;
   /** Stores shared auto_increment etc. */
   Partition_share *part_share;
+  /** Fix spurious -Werror=overloaded-virtual in GCC 9 */
+  virtual void restore_auto_increment(ulonglong prev_insert_id)
+  {
+    handler::restore_auto_increment(prev_insert_id);
+  }
   /** Store and restore next_auto_inc_val over duplicate key errors. */
   virtual void store_auto_increment()
   {

diff --git a/storage/mroonga/ha_mroonga.hpp b/storage/mroonga/ha_mroonga.hpp
@@ -571,6 +571,11 @@ class ha_mroonga: public handler
   void set_next_insert_id(ulonglong id);
   void get_auto_increment(ulonglong offset, ulonglong increment, ulonglong nb_desired_values,
                           ulonglong *first_value, ulonglong *nb_reserved_values) mrn_override;
+  /** Fix spurious -Werror=overloaded-virtual in GCC 9 */
+  void restore_auto_increment() mrn_override
+  {
+    handler::restore_auto_increment();
+  }
   void restore_auto_increment(ulonglong prev_insert_id) mrn_override;
   void release_auto_increment() mrn_override;
   int check_for_upgrade(HA_CHECK_OPT *check_opt) mrn_override;