summaryrefslogtreecommitdiff
path: root/mysql-test/t/join.test
diff options
context:
space:
mode:
authorKristofer Pettersson <kristofer.pettersson@oracle.com>2010-09-07 15:43:00 +0200
committerKristofer Pettersson <kristofer.pettersson@oracle.com>2010-09-07 15:43:00 +0200
commit6d18ac0308be36cc819f498d57930976969e17f7 (patch)
tree529ea3cb13e4d4e89a6011d6e7264b5f6487151d /mysql-test/t/join.test
parent8e2468a85ebc72cfbc9f12a9e1f957fb35780063 (diff)
downloadmariadb-git-6d18ac0308be36cc819f498d57930976969e17f7.tar.gz
Post fix following fix for bug55531: Disabling testcase for
bug 55568 because {1} isn't a valid geometry for a geometry collection.
Diffstat (limited to 'mysql-test/t/join.test')
-rw-r--r--mysql-test/t/join.test58
1 files changed, 31 insertions, 27 deletions
diff --git a/mysql-test/t/join.test b/mysql-test/t/join.test
index 73a1ae5eb82..05d630edfb2 100644
--- a/mysql-test/t/join.test
+++ b/mysql-test/t/join.test
@@ -851,33 +851,37 @@ ENGINE=MERGE UNION=(t1,t2);
SELECT t1.a FROM mm1,t1;
DROP TABLE t1, t2, mm1;
---echo #
---echo # Bug #55568: user variable assignments crash server when used within
---echo # query
---echo #
-
-CREATE TABLE t1 (a INT);
-
-INSERT INTO t1 VALUES (0), (1);
-
-let $i=2;
-while ($i)
-{
- 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;
- dec $i;
-}
-
-DROP TABLE t1;
+#--echo #
+#--echo # Bug #55568: user variable assignments crash server when used within
+#--echo # query
+#--echo #
+#
+#
+# This test case is invalidated because of fix of bug 55531
+# The reason is that {1} is not a valid geometric collection.
+#
+#CREATE TABLE t1 (a INT);
+
+#INSERT INTO t1 VALUES (0), (1);
+
+#let $i=2;
+#while ($i)
+#{
+# 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;
+# dec $i;
+#}
+#
+#DROP TABLE t1;
--echo #
--echo # Bug #54468: crash after item's print() function when ordering/grouping