diff options
| author | Alexey Botchkov <holyfoot@askmonty.org> | 2020-11-23 14:12:30 +0400 |
|---|---|---|
| committer | Alexey Botchkov <holyfoot@askmonty.org> | 2020-11-23 14:12:30 +0400 |
| commit | 75e7132fca1c4634d4aa8d18d386c55932a5e1b6 (patch) | |
| tree | ddd3bb2821e952f644e1f7affd100e6b553d57e9 /storage/mroonga | |
| parent | eae9311fa2b15eb8a0698444a27af5b70acfb4b2 (diff) | |
| download | mariadb-git-75e7132fca1c4634d4aa8d18d386c55932a5e1b6.tar.gz | |
MDEV-21842 auto_increment does not increment with compound primary key on partitioned table.
The idea of this fix is that it's enough to prevent the
next_auto_inc_val from incrementing if an error, to fix this problem
and also the MDEV-17333.
So this patch basically reverts the existing fix to the MDEV-17333.
Diffstat (limited to 'storage/mroonga')
| -rw-r--r-- | storage/mroonga/ha_mroonga.hpp | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/storage/mroonga/ha_mroonga.hpp b/storage/mroonga/ha_mroonga.hpp index e1dbb63178e..f2fb2bfe8e7 100644 --- a/storage/mroonga/ha_mroonga.hpp +++ b/storage/mroonga/ha_mroonga.hpp @@ -571,11 +571,6 @@ 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; - /** 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; |