diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-11 08:41:36 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-10-11 08:41:36 +0300 |
| commit | d04f2de80a96b3ff9290ee27507195bfb01fc77f (patch) | |
| tree | 49da698fbe99c5888f41238b0cda4e1eedebf2e2 /storage/mroonga | |
| parent | 5e17b1f7cbfc256850ed139a0a4898040e16ff60 (diff) | |
| parent | b05be3ef8c8668ddbcbe8e1c08dcd4fcc88eb4cf (diff) | |
| download | mariadb-git-d04f2de80a96b3ff9290ee27507195bfb01fc77f.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'storage/mroonga')
| -rw-r--r-- | storage/mroonga/ha_mroonga.hpp | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/storage/mroonga/ha_mroonga.hpp b/storage/mroonga/ha_mroonga.hpp index d105a0738ca..4e3f4bec17c 100644 --- a/storage/mroonga/ha_mroonga.hpp +++ b/storage/mroonga/ha_mroonga.hpp @@ -571,7 +571,12 @@ public: 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; - void restore_auto_increment(ulonglong prev_insert_id); + /** 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; #ifdef MRN_HANDLER_HAVE_RESET_AUTO_INCREMENT |