Commit dc285eb7 authored by Kristofer Pettersson's avatar Kristofer Pettersson

Post fix following fix for bug55531: Disabling testcase for

bug 55568 because {1} isn't a valid geometry for a geometry
collection.
parent 3a643b0a
...@@ -1185,41 +1185,6 @@ NULL ...@@ -1185,41 +1185,6 @@ NULL
1 1
DROP TABLE t1, t2, mm1; DROP TABLE t1, t2, mm1;
# #
# Bug #55568: user variable assignments crash server when used within
# query
#
CREATE TABLE t1 (a INT);
INSERT INTO t1 VALUES (0), (1);
SELECT MULTIPOINT(
1,
(
SELECT MULTIPOINT(
MULTIPOINT(
1,
(SELECT COUNT(*) FROM (SELECT 1 FROM t1 GROUP BY a,a) d)
)
) FROM t1
)
) != COUNT(*) q FROM t1 GROUP BY a;
q
NULL
NULL
SELECT MULTIPOINT(
1,
(
SELECT MULTIPOINT(
MULTIPOINT(
1,
(SELECT COUNT(*) FROM (SELECT 1 FROM t1 GROUP BY a,a) d)
)
) FROM t1
)
) != COUNT(*) q FROM t1 GROUP BY a;
q
NULL
NULL
DROP TABLE t1;
#
# Bug #54468: crash after item's print() function when ordering/grouping # Bug #54468: crash after item's print() function when ordering/grouping
# by subquery # by subquery
# #
......
...@@ -851,33 +851,37 @@ ENGINE=MERGE UNION=(t1,t2); ...@@ -851,33 +851,37 @@ ENGINE=MERGE UNION=(t1,t2);
SELECT t1.a FROM mm1,t1; SELECT t1.a FROM mm1,t1;
DROP TABLE t1, t2, mm1; DROP TABLE t1, t2, mm1;
--echo # #--echo #
--echo # Bug #55568: user variable assignments crash server when used within #--echo # Bug #55568: user variable assignments crash server when used within
--echo # query #--echo # query
--echo # #--echo #
#
CREATE TABLE t1 (a INT); #
# This test case is invalidated because of fix of bug 55531
INSERT INTO t1 VALUES (0), (1); # The reason is that {1} is not a valid geometric collection.
#
let $i=2; #CREATE TABLE t1 (a INT);
while ($i)
{ #INSERT INTO t1 VALUES (0), (1);
SELECT MULTIPOINT(
1, #let $i=2;
( #while ($i)
SELECT MULTIPOINT( #{
MULTIPOINT( # SELECT MULTIPOINT(
1, # 1,
(SELECT COUNT(*) FROM (SELECT 1 FROM t1 GROUP BY a,a) d) # (
) # SELECT MULTIPOINT(
) FROM t1 # MULTIPOINT(
) # 1,
) != COUNT(*) q FROM t1 GROUP BY a; # (SELECT COUNT(*) FROM (SELECT 1 FROM t1 GROUP BY a,a) d)
dec $i; # )
} # ) FROM t1
# )
DROP TABLE t1; # ) != COUNT(*) q FROM t1 GROUP BY a;
# dec $i;
#}
#
#DROP TABLE t1;
--echo # --echo #
--echo # Bug #54468: crash after item's print() function when ordering/grouping --echo # Bug #54468: crash after item's print() function when ordering/grouping
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment