diff options
8 files changed, 13 insertions, 12 deletions
diff --git a/mysql-test/suite/storage_engine/foreign_keys.test b/mysql-test/suite/storage_engine/foreign_keys.test index cbadc4c950d..4991862685f 100644 --- a/mysql-test/suite/storage_engine/foreign_keys.test +++ b/mysql-test/suite/storage_engine/foreign_keys.test @@ -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 diff --git a/mysql-test/suite/storage_engine/type_spatial.result b/mysql-test/suite/storage_engine/type_spatial.result index 6c2f5a4d50f..e1ae2f1fa64 100644 --- a/mysql-test/suite/storage_engine/type_spatial.result +++ b/mysql-test/suite/storage_engine/type_spatial.result @@ -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 diff --git a/mysql-test/suite/storage_engine/type_spatial_indexes.result b/mysql-test/suite/storage_engine/type_spatial_indexes.result index 93bb4c617e5..8c73b4b0a23 100644 --- a/mysql-test/suite/storage_engine/type_spatial_indexes.result +++ b/mysql-test/suite/storage_engine/type_spatial_indexes.result @@ -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 diff --git a/storage/myisam/mysql-test/storage_engine/disabled.def b/storage/myisam/mysql-test/storage_engine/disabled.def new file mode 100644 index 00000000000..c2bfd926381 --- /dev/null +++ b/storage/myisam/mysql-test/storage_engine/disabled.def @@ -0,0 +1 @@ +type_spatial_indexes : MDEV-8675 Different results of GIS functions on NULL vs NOT NULL columns diff --git a/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff b/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff index 205e7314fda..cf24f2c3e61 100644 --- a/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff +++ b/storage/myisam/mysql-test/storage_engine/foreign_keys.rdiff @@ -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. diff --git a/storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff b/storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff index 1fa6c184a6d..fc07ebc0e94 100644 --- a/storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/foreign_keys.rdiff @@ -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. diff --git a/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff b/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff index 52e9d9fdbe4..024c1646892 100644 --- a/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/type_spatial.rdiff @@ -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 diff --git a/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff b/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff index ecd0025c9d9..51e5ea3e4a7 100644 --- a/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff @@ -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 |