Skip to content

Commit 80089a6

Browse files
elenstelenst
committed
Follow-up for MDEV-8675 and MDEV-8676
type_spatial_indexes test is now be re-enabled, and the new result file can be used for creating engine-specific rdiffs
1 parent 6cc2e7e commit 80089a6

File tree

5 files changed

+8
-9
lines changed

5 files changed

+8
-9
lines changed

‎mysql-test/suite/storage_engine/type_spatial_indexes.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -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,
11121112
Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
11131113
FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
11141114
first second w c o e d t i r
1115-
120 120 1 1 0 1 0 1 1 0
1115+
120 120 1 1 0 1 0 0 1 0
11161116
120 121 0 0 1 0 0 0 1 0
11171117
120 122 NULL NULL NULL NULL NULL NULL NULL NULL
11181118
120 123 NULL NULL NULL NULL NULL NULL NULL NULL
11191119
121 120 0 0 1 0 0 0 1 0
1120-
121 121 1 1 0 1 0 1 1 0
1120+
121 121 1 1 0 1 0 0 1 0
11211121
121 122 NULL NULL NULL NULL NULL NULL NULL NULL
11221122
121 123 NULL NULL NULL NULL NULL NULL NULL NULL
11231123
122 120 NULL NULL NULL NULL NULL NULL NULL NULL

‎storage/innobase/mysql-test/storage_engine/type_spatial_indexes.rdiff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,12 +414,12 @@
414414
-Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
415415
-FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
416416
-first second w c o e d t i r
417-
-120 120 1 1 0 1 0 1 1 0
417+
-120 120 1 1 0 1 0 0 1 0
418418
-120 121 0 0 1 0 0 0 1 0
419419
-120 122 NULL NULL NULL NULL NULL NULL NULL NULL
420420
-120 123 NULL NULL NULL NULL NULL NULL NULL NULL
421421
-121 120 0 0 1 0 0 0 1 0
422-
-121 121 1 1 0 1 0 1 1 0
422+
-121 121 1 1 0 1 0 0 1 0
423423
-121 122 NULL NULL NULL NULL NULL NULL NULL NULL
424424
-121 123 NULL NULL NULL NULL NULL NULL NULL NULL
425425
-122 120 NULL NULL NULL NULL NULL NULL NULL NULL

‎storage/myisam/mysql-test/storage_engine/disabled.def

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎storage/myisammrg/mysql-test/storage_engine/type_spatial_indexes.rdiff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1124,12 +1124,12 @@
11241124
-Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
11251125
-FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
11261126
-first second w c o e d t i r
1127-
-120 120 1 1 0 1 0 1 1 0
1127+
-120 120 1 1 0 1 0 0 1 0
11281128
-120 121 0 0 1 0 0 0 1 0
11291129
-120 122 NULL NULL NULL NULL NULL NULL NULL NULL
11301130
-120 123 NULL NULL NULL NULL NULL NULL NULL NULL
11311131
-121 120 0 0 1 0 0 0 1 0
1132-
-121 121 1 1 0 1 0 1 1 0
1132+
-121 121 1 1 0 1 0 0 1 0
11331133
-121 122 NULL NULL NULL NULL NULL NULL NULL NULL
11341134
-121 123 NULL NULL NULL NULL NULL NULL NULL NULL
11351135
-122 120 NULL NULL NULL NULL NULL NULL NULL NULL

‎storage/xtradb/mysql-test/storage_engine/type_spatial_indexes.rdiff

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -414,12 +414,12 @@
414414
-Intersects(g1.g, g2.g) as i, Crosses(g1.g, g2.g) as r
415415
-FROM gis_geometrycollection g1, gis_geometrycollection g2 ORDER BY first, second;
416416
-first second w c o e d t i r
417-
-120 120 1 1 0 1 0 1 1 0
417+
-120 120 1 1 0 1 0 0 1 0
418418
-120 121 0 0 1 0 0 0 1 0
419419
-120 122 NULL NULL NULL NULL NULL NULL NULL NULL
420420
-120 123 NULL NULL NULL NULL NULL NULL NULL NULL
421421
-121 120 0 0 1 0 0 0 1 0
422-
-121 121 1 1 0 1 0 1 1 0
422+
-121 121 1 1 0 1 0 0 1 0
423423
-121 122 NULL NULL NULL NULL NULL NULL NULL NULL
424424
-121 123 NULL NULL NULL NULL NULL NULL NULL NULL
425425
-122 120 NULL NULL NULL NULL NULL NULL NULL NULL

0 commit comments

Comments
 (0)