Skip to content

Commit

Permalink
Follow-up for MDEV-8675 and MDEV-8676
Browse files Browse the repository at this point in the history 
type_spatial_indexes test is now be re-enabled, and the new result file
can be used for creating engine-specific rdiffs
  • Loading branch information
@elenst
elenst committed Sep 14, 2015
1 parent 6cc2e7e commit 80089a6
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 9 deletions.
4 changes: 2 additions & 2 deletions mysql-test/suite/storage_engine/type_spatial_indexes.result
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
1 change: 0 additions & 1 deletion storage/myisam/mysql-test/storage_engine/disabled.def
View file

This file was deleted.

4 changes: 2 additions & 2 deletions storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions storage/xtradb/mysql-test/storage_engine/type_spatial_indexes.rdiff
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 80089a6

Please sign in to comment.