diff options
5 files changed, 8 insertions, 9 deletions
diff --git a/mysql-test/suite/storage_engine/type_spatial_indexes.result b/mysql-test/suite/storage_engine/type_spatial_indexes.result index 8c73b4b0a23..1c9fee3ceac 100644 --- a/mysql-test/suite/storage_engine/type_spatial_indexes.result +++ b/mysql-test/suite/storage_engine/type_spatial_indexes.result @@ -1112,12 +1112,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/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff b/storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff index d3fb59e6ce3..154116b748c 100644 --- a/storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff +++ b/storage/innobase/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 diff --git a/storage/myisam/mysql-test/storage_engine/disabled.def b/storage/myisam/mysql-test/storage_engine/disabled.def deleted file mode 100644 index c2bfd926381..00000000000 --- a/storage/myisam/mysql-test/storage_engine/disabled.def +++ /dev/null @@ -1 +0,0 @@ -type_spatial_indexes : MDEV-8675 Different results of GIS functions on NULL vs NOT NULL columns 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 51e5ea3e4a7..1caa6c3d5a8 100644 --- a/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff +++ b/storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff @@ -1124,12 +1124,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/xtradb/mysql-test/storage_engine/type_spatial_indexes.rdiff b/storage/xtradb/mysql-test/storage_engine/type_spatial_indexes.rdiff index d3fb59e6ce3..154116b748c 100644 --- a/storage/xtradb/mysql-test/storage_engine/type_spatial_indexes.rdiff +++ b/storage/xtradb/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 |