diff options
| author | Aleksey Midenkov <midenok@gmail.com> | 2019-10-10 11:08:31 +0300 |
|---|---|---|
| committer | Aleksey Midenkov <midenok@gmail.com> | 2019-10-10 11:13:05 +0300 |
| commit | 3c78d1b640f545025235bf52a0bde987817c3685 (patch) | |
| tree | 9754f2f451152fe017105337d3fe7a36583cad06 | |
| parent | cb3f856ecdcaa2f63f51762f36226869ff08738f (diff) | |
| download | mariadb-git-3c78d1b640f545025235bf52a0bde987817c3685.tar.gz | |
Fix Mroonga compilation
Fixed warnings: -Woverloaded-virtual, -Winconsistent-missing-override
Caused by c9cba59749e1b5a39a9e3a0a5b8bd762507245f9
| -rw-r--r-- | sql/handler.h | 2 | ||||
| -rw-r--r-- | storage/mroonga/ha_mroonga.hpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/sql/handler.h b/sql/handler.h index fcaec4d5030..345e0bc1f00 100644 --- a/sql/handler.h +++ b/sql/handler.h @@ -3688,7 +3688,7 @@ public: DBUG_PRINT("info",("auto_increment: next value %lu", (ulong)id)); next_insert_id= id; } - void restore_auto_increment(ulonglong prev_insert_id) + virtual void restore_auto_increment(ulonglong prev_insert_id) { /* Insertion of a row failed, re-use the lastly generated auto_increment diff --git a/storage/mroonga/ha_mroonga.hpp b/storage/mroonga/ha_mroonga.hpp index 7347af25bdc..f2fb2bfe8e7 100644 --- a/storage/mroonga/ha_mroonga.hpp +++ b/storage/mroonga/ha_mroonga.hpp @@ -571,7 +571,7 @@ 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); + 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 |