Skip to content

Commit d110617

Browse files
MDEV-36694 main.spatial_utility_function_collect broken for --view-protocol
Temporarily exclude the two affected queries because the DISTINCT flag isn't consistently passed to the Item_func_collect class. Created MDEV-36695 to address that bug.
1 parent cbd6755 commit d110617

File tree

2 files changed

+11
-0
lines changed

2 files changed

+11
-0
lines changed

mysql-test/main/spatial_utility_function_collect.result

+2
Original file line numberDiff line numberDiff line change
@@ -90,6 +90,7 @@ MULTIPOINT(3 0) 55
9090
NULL 55
9191
NULL 55
9292
NULL 55
93+
# remove disable_view_protocol after fixing MDEV-36695
9394
SELECT ST_ASTEXT(ST_COLLECT(DISTINCT location)) AS geo, SUM(grouping_condition)
9495
OVER(), grouping_condition FROM table_simple_aggregation GROUP BY
9596
grouping_condition;
@@ -200,6 +201,7 @@ GEOMETRYCOLLECTION(MULTIPOINT(6 0),GEOMETRYCOLLECTION EMPTY)
200201
GEOMETRYCOLLECTION(GEOMETRYCOLLECTION EMPTY,GEOMETRYCOLLECTION EMPTY)
201202
# with DISTINCT this result is expected to be:
202203
# MP, GC, MLS, GC, MPpoly, GC, GC, GC, GC with only one EMPTY GC
204+
# remove disable_view_protocol after fixing MDEV-36695
203205
SELECT ST_ASTEXT(ST_COLLECT(DISTINCT geo) OVER( ORDER BY running_number ROWS BETWEEN 1
204206
PRECEDING AND CURRENT ROW)) AS geocollect FROM simple_table;
205207
geocollect

mysql-test/main/spatial_utility_function_collect.test

+9
Original file line numberDiff line numberDiff line change
@@ -81,9 +81,14 @@ CURRENT ROW)) c FROM table_simple_aggregation;
8181
SELECT ST_ASTEXT(ST_COLLECT(DISTINCT location)) AS geo, SUM(running_number)
8282
OVER() FROM table_simple_aggregation GROUP BY running_number;
8383
--sorted_result
84+
85+
--echo # remove disable_view_protocol after fixing MDEV-36695
86+
--disable_view_protocol
8487
SELECT ST_ASTEXT(ST_COLLECT(DISTINCT location)) AS geo, SUM(grouping_condition)
8588
OVER(), grouping_condition FROM table_simple_aggregation GROUP BY
8689
grouping_condition;
90+
--enable_view_protocol
91+
8792
--sorted_result
8893
SELECT ST_ASTEXT(ST_COLLECT(location)) AS geo, SUM(grouping_condition) OVER(),
8994
grouping_condition FROM table_simple_aggregation GROUP BY grouping_condition;
@@ -171,8 +176,12 @@ SELECT ST_ASTEXT(ST_COLLECT(geo) OVER( ORDER BY running_number ROWS BETWEEN 1
171176
PRECEDING AND CURRENT ROW)) AS geocollect FROM simple_table;
172177
--echo # with DISTINCT this result is expected to be:
173178
--echo # MP, GC, MLS, GC, MPpoly, GC, GC, GC, GC with only one EMPTY GC
179+
180+
--echo # remove disable_view_protocol after fixing MDEV-36695
181+
--disable_view_protocol
174182
SELECT ST_ASTEXT(ST_COLLECT(DISTINCT geo) OVER( ORDER BY running_number ROWS BETWEEN 1
175183
PRECEDING AND CURRENT ROW)) AS geocollect FROM simple_table;
184+
--enable_view_protocol
176185

177186
--echo # Exercising the "copy" constructor
178187
SELECT ST_ASTEXT(ST_COLLECT(geo)) FROM simple_table GROUP BY geo WITH ROLLUP;

0 commit comments

Comments
 (0)