Commit cf154cc9 authored by Elena Stepanova's avatar Elena Stepanova

MDEV-8676 Some storage_engine tests fail on 10.1

- foreign_keys: adjusted according to code changes;
- type_spatial: adjusted according to code changes;
- type_spatial_indexes (for MyISAM): disabled till MDEV-8675 is fixed
parent 871259f1
......@@ -77,10 +77,10 @@ if (!$mysql_errname)
--sorted_result
SELECT a,b FROM t2;
--let $error_codes = ER_ROW_IS_REFERENCED
--let $error_codes = ER_ROW_IS_REFERENCED_2
DROP TABLE t1;
--source check_errors.inc
if ($mysql_errname != ER_ROW_IS_REFERENCED)
if ($mysql_errname != ER_ROW_IS_REFERENCED_2)
{
--let $functionality = Foreign keys
--source unexpected_result.inc
......
......@@ -412,12 +412,12 @@ Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t,
Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
first second w c o e d t i r
120 120 1 1 0 1 0 1 1 0
120 120 1 1 0 1 0 0 1 0
120 121 0 0 1 0 0 0 1 0
120 122 NULL NULL NULL NULL NULL NULL NULL NULL
120 123 NULL NULL NULL NULL NULL NULL NULL NULL
121 120 0 0 1 0 0 0 1 0
121 121 1 1 0 1 0 1 1 0
121 121 1 1 0 1 0 0 1 0
121 122 NULL NULL NULL NULL NULL NULL NULL NULL
121 123 NULL NULL NULL NULL NULL NULL NULL NULL
122 120 NULL NULL NULL NULL NULL NULL NULL NULL
......
......@@ -412,12 +412,12 @@ Equals(g1.g, g2.g) as e, Disjoint(g1.g, g2.g) as d, Touches(g1.g, g2.g) as t,
Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
first second w c o e d t i r
120 120 1 1 0 1 0 1 1 0
120 120 1 1 0 1 0 0 1 0
120 121 0 0 1 0 0 0 1 0
120 122 NULL NULL NULL NULL NULL NULL NULL NULL
120 123 NULL NULL NULL NULL NULL NULL NULL NULL
121 120 0 0 1 0 0 0 1 0
121 121 1 1 0 1 0 1 1 0
121 121 1 1 0 1 0 0 1 0
121 122 NULL NULL NULL NULL NULL NULL NULL NULL
121 123 NULL NULL NULL NULL NULL NULL NULL NULL
122 120 NULL NULL NULL NULL NULL NULL NULL NULL
......
type_spatial_indexes : MDEV-8675 Different results of GIS functions on NULL vs NOT NULL columns
......@@ -56,7 +56,7 @@
+3 b
DROP TABLE t1;
-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails
+# ERROR: Statement succeeded (expected results: ER_ROW_IS_REFERENCED)
+# ERROR: Statement succeeded (expected results: ER_ROW_IS_REFERENCED_2)
+# ------------ UNEXPECTED RESULT ------------
+# The statement|command succeeded unexpectedly.
+# Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors.
......
......@@ -57,7 +57,7 @@
+3 b
DROP TABLE t1;
-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails
+# ERROR: Statement succeeded (expected results: ER_ROW_IS_REFERENCED)
+# ERROR: Statement succeeded (expected results: ER_ROW_IS_REFERENCED_2)
+# ------------ UNEXPECTED RESULT ------------
+# The statement|command succeeded unexpectedly.
+# Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors.
......
......@@ -414,12 +414,12 @@
-Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
-FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
-first second w c o e d t i r
-120 120 1 1 0 1 0 1 1 0
-120 120 1 1 0 1 0 0 1 0
-120 121 0 0 1 0 0 0 1 0
-120 122 NULL NULL NULL NULL NULL NULL NULL NULL
-120 123 NULL NULL NULL NULL NULL NULL NULL NULL
-121 120 0 0 1 0 0 0 1 0
-121 121 1 1 0 1 0 1 1 0
-121 121 1 1 0 1 0 0 1 0
-121 122 NULL NULL NULL NULL NULL NULL NULL NULL
-121 123 NULL NULL NULL NULL NULL NULL NULL NULL
-122 120 NULL NULL NULL NULL NULL NULL NULL NULL
......
......@@ -414,12 +414,12 @@
-Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
-FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
-first second w c o e d t i r
-120 120 1 1 0 1 0 1 1 0
-120 120 1 1 0 1 0 0 1 0
-120 121 0 0 1 0 0 0 1 0
-120 122 NULL NULL NULL NULL NULL NULL NULL NULL
-120 123 NULL NULL NULL NULL NULL NULL NULL NULL
-121 120 0 0 1 0 0 0 1 0
-121 121 1 1 0 1 0 1 1 0
-121 121 1 1 0 1 0 0 1 0
-121 122 NULL NULL NULL NULL NULL NULL NULL NULL
-121 123 NULL NULL NULL NULL NULL NULL NULL NULL
-122 120 NULL NULL NULL NULL NULL NULL NULL NULL
......
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