MDEV-34940: Fix Item_func_collect inheritance #3525
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
|
DaveGosselin-MariaDB
requested review from
abarkov
and removed request for
vuvova
abarkov
requested changes
Oct 22, 2024
| @@ -4637,7 +4664,7 @@ void Item_func_collect::clear() { | |||
| void Item_func_collect::cleanup() { | |||
| List_iterator<String> geometries_iterator(geometries); | |||
| geometries.delete_elements(); | |||
| Item_sum_int::cleanup(); | |||
| Item_sum::cleanup(); | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
I think it should be Item_sum_str::cleanup() here.
Creates new parent Item_sum_str for Item_func_group_concat and Item_func_collect, migrating shared methods from each of those latter classes to the former. Simultaneously, tighten up the method scopes.
DaveGosselin-MariaDB
force-pushed
the
11.7-mdev-34940
branch
from
a764152
to
d4e0367
Compare
DaveGosselin-MariaDB
merged commit 2674c47
into
bb-11.7-mdev-34120-gis-functions
12 of 16 checks passed
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Creates new parent Item_sum_str for Item_func_group_concat and Item_func_collect, migrating shared methods from each of those latter classes to the former. Simultaneously, tighten up the method scopes.