database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-09 22:24:09 +03:00
Code Activity

MDEV-8676 Some storage_engine tests fail on 10.1

Browse Source 
- 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
This commit is contained in:
Elena Stepanova
2015-08-26 02:09:57 +03:00
parent 871259f171
commit cf154cc9d2
8 changed files with 13 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
mysql-test/suite/storage_engine/foreign_keys.test
View File

@@ -77,10 +77,10 @@ if (!$mysql_errname)
--sorted_result --sorted_result
SELECT a,b FROM t2; SELECT a,b FROM t2;
--let $error_codes = ER_ROW_IS_REFERENCED --let $error_codes = ER_ROW_IS_REFERENCED_2
DROP TABLE t1; DROP TABLE t1;
--source check_errors.inc --source check_errors.inc
if ($mysql_errname != ER_ROW_IS_REFERENCED) if ($mysql_errname != ER_ROW_IS_REFERENCED_2)
{ {
--let $functionality = Foreign keys --let $functionality = Foreign keys
--source unexpected_result.inc --source unexpected_result.inc

4
mysql-test/suite/storage_engine/type_spatial.result
View File

@@ -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 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; FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
first second w c o e d t i r 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 121 0 0 1 0 0 0 1 0
120 122 NULL NULL NULL NULL NULL NULL NULL NULL 120 122 NULL NULL NULL NULL NULL NULL NULL NULL
120 123 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 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 122 NULL NULL NULL NULL NULL NULL NULL NULL
121 123 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 122 120 NULL NULL NULL NULL NULL NULL NULL NULL

4
mysql-test/suite/storage_engine/type_spatial_indexes.result
View File

@@ -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 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; FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
first second w c o e d t i r 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 121 0 0 1 0 0 0 1 0
120 122 NULL NULL NULL NULL NULL NULL NULL NULL 120 122 NULL NULL NULL NULL NULL NULL NULL NULL
120 123 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 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 122 NULL NULL NULL NULL NULL NULL NULL NULL
121 123 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 122 120 NULL NULL NULL NULL NULL NULL NULL NULL

1
storage/myisam/mysql-test/storage_engine/disabled.def Normal file
View File

@@ -0,0 +1 @@
type_spatial_indexes : MDEV-8675 Different results of GIS functions on NULL vs NOT NULL columns

2
storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff
View File

@@ -56,7 +56,7 @@
+3 b +3 b
DROP TABLE t1; DROP TABLE t1;
-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails -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 ------------ +# ------------ UNEXPECTED RESULT ------------
+# The statement|command succeeded unexpectedly. +# The statement|command succeeded unexpectedly.
+# Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. +# Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors.

2
storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff
View File

@@ -57,7 +57,7 @@
+3 b +3 b
DROP TABLE t1; DROP TABLE t1;
-ERROR 23000: Cannot delete or update a parent row: a foreign key constraint fails -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 ------------ +# ------------ UNEXPECTED RESULT ------------
+# The statement|command succeeded unexpectedly. +# The statement|command succeeded unexpectedly.
+# Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors. +# Foreign keys or the mix could be unsupported|malfunctioning, or the problem was caused by previous errors.

4
storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff
View File

@@ -414,12 +414,12 @@
-Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r -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; -FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
-first second w c o e d t i r -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 121 0 0 1 0 0 0 1 0
-120 122 NULL NULL NULL NULL NULL NULL NULL NULL -120 122 NULL NULL NULL NULL NULL NULL NULL NULL
-120 123 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 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 122 NULL NULL NULL NULL NULL NULL NULL NULL
-121 123 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 -122 120 NULL NULL NULL NULL NULL NULL NULL NULL

4
storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff
View File

@@ -414,12 +414,12 @@
-Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r -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; -FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
-first second w c o e d t i r -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 121 0 0 1 0 0 0 1 0
-120 122 NULL NULL NULL NULL NULL NULL NULL NULL -120 122 NULL NULL NULL NULL NULL NULL NULL NULL
-120 123 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 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 122 NULL NULL NULL NULL NULL NULL NULL NULL
-121 123 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 -122 120 NULL NULL NULL NULL NULL NULL NULL NULL