mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 20:07:13 +02:00
Code Issues Projects Releases Packages Wiki 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
commit cf154cc9d2
8 changed files with 13 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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.

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
-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

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
-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