Commit 545c5452 authored by Aleksey Midenkov's avatar Aleksey Midenkov

Fix compilation 2 (GCC 9)

Fixed warning: -Woverloaded-virtual for GCC 9 (Clang treats it differently)

Caused by c9cba597
parent 3c78d1b6
...@@ -373,6 +373,11 @@ class ha_partition :public handler ...@@ -373,6 +373,11 @@ class ha_partition :public handler
MY_BITMAP m_locked_partitions; MY_BITMAP m_locked_partitions;
/** Stores shared auto_increment etc. */ /** Stores shared auto_increment etc. */
Partition_share *part_share; 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. */ /** Store and restore next_auto_inc_val over duplicate key errors. */
virtual void store_auto_increment() virtual void store_auto_increment()
{ {
......
...@@ -571,6 +571,11 @@ public: ...@@ -571,6 +571,11 @@ public:
void set_next_insert_id(ulonglong id); void set_next_insert_id(ulonglong id);
void get_auto_increment(ulonglong offset, ulonglong increment, ulonglong nb_desired_values, void get_auto_increment(ulonglong offset, ulonglong increment, ulonglong nb_desired_values,
ulonglong *first_value, ulonglong *nb_reserved_values) mrn_override; 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 restore_auto_increment(ulonglong prev_insert_id) mrn_override;
void release_auto_increment() mrn_override; void release_auto_increment() mrn_override;
int check_for_upgrade(HA_CHECK_OPT *check_opt) mrn_override; int check_for_upgrade(HA_CHECK_OPT *check_opt) mrn_override;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment