Skip to content

Commit a0ce62f

Browse files
author
Alexey Botchkov
committed
MDEV-14057 InnoDB GIS tests fail.
Tests fixed. MBR::Within() function fixed.
1 parent 09e8707 commit a0ce62f

19 files changed

+282
-257
lines changed

‎mysql-test/r/gis-rtree.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,13 +1576,13 @@ INSERT INTO t1 VALUES(GeomFromText('LINESTRING(2 2, 3 3)'));
15761576
SELECT COUNT(*) FROM t1 IGNORE INDEX(l) WHERE MBRContains(l, GEOMFROMTEXT('POINT(0 0)'));
15771577
COUNT(*)
15781578
1
1579-
SELECT COUNT(*) FROM t1 IGNORE INDEX(l) WHERE MBRWithin(GEOMFROMTEXT('POINT(0 0)'), l);
1579+
SELECT COUNT(*) FROM t1 IGNORE INDEX(l) WHERE MBRWithin(GEOMFROMTEXT('POINT(0.5 0.5)'), l);
15801580
COUNT(*)
15811581
1
15821582
SELECT COUNT(*) FROM t1 FORCE INDEX(l) WHERE MBRContains(l, GEOMFROMTEXT('POINT(0 0)'));
15831583
COUNT(*)
15841584
1
1585-
SELECT COUNT(*) FROM t1 FORCE INDEX(l) WHERE MBRWithin(GEOMFROMTEXT('POINT(0 0)'), l);
1585+
SELECT COUNT(*) FROM t1 FORCE INDEX(l) WHERE MBRWithin(GEOMFROMTEXT('POINT(0.5 0.5)'), l);
15861586
COUNT(*)
15871587
1
15881588
DROP TABLE t1;

‎mysql-test/suite/innodb_gis/disabled.def

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,3 @@
1010
#
1111
##############################################################################
1212

13-
gis_split_inf : MDEV-14057 InnoDB GIS tests fail
14-
rtree_multi_pk : MDEV-14057 InnoDB GIS tests fail
15-
point_big : MDEV-14057 InnoDB GIS tests fail
16-
geometry : MDEV-14057 InnoDB GIS tests fail
17-
bug16236208 : MDEV-14057 InnoDB GIS tests fail
18-
bug16266012 : MDEV-14057 InnoDB GIS tests fail

‎mysql-test/suite/innodb_gis/r/bug16236208.result

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -39,5 +39,5 @@ ST_WITHIN( ST_GeomFromText('POLYGON( ( 4135 3009 , 4914 3087 , 4236 3194 , 4091
3939
ST_GeomFromText('MULTILINESTRING( ( 4147 2871 , 4072 3042 , 4081 3099 , 3796
4040
3021 , 4007 3463 ) , ( 4042 2808 , 4109 2816 , 3730 3673 ) )') ,
4141
linestring_key ) AND ST_Length( linestring_nokey ) > 1;
42-
ERROR 22023: Invalid GIS data provided to function st_within.
42+
ST_AsText(linestring_nokey)
4343
DROP TABLE linestring;

‎mysql-test/suite/innodb_gis/r/bug16266012.result

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,9 @@ MULTIPOLYGON( ( ( 0 0 , 7 1 , 6 8 , 0 0 ) ) , ( ( 9 9 , 4 0 , 4 7 , 9 9) ) )
66
') ) , ST_SYMDIFFERENCE( POLYGONFROMTEXT(' POLYGON( ( 9 9 , 6 5 , 2 3 , 9 9
77
) ) ') , MULTIPOLYGONFROMTEXT(' MULTIPOLYGON( ( ( 2 2 , 5 2 , 5 2 , 2 6 , 2
88
2 ) ) , ( ( 7 7 , 3 7 , 2 9 , 7 1 , 7 7 ) ) ) ') ) ) );
9-
ERROR HY000: Geometry overlay calculation error: geometry data is invalid in function st_union.
9+
ST_WITHIN( LINESTRINGFROMTEXT(' LINESTRING( 5 9 , 3 4 , 4 1 , 4
10+
4 , 4 9 ) ') , ST_SYMDIFFERENCE( ST_UNION( ST_ENVELOPE( POLYGONFROMTEXT('
11+
POLYGON( ( 3 2 , 0 6 , 2 3 , 8 0 , 4 6 , 7 2 , 3 2 ) ) ') ) ,
12+
MULTIPOLYGONFROMTEXT('
13+
MULTIPOLYGON( ( ( 0 0 , 7 1 , 6
14+
0

‎mysql-test/suite/innodb_gis/r/geometry.result

Lines changed: 121 additions & 134 deletions
Large diffs are not rendered by default.

‎mysql-test/suite/innodb_gis/r/gis_split_inf.result

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,16 @@
11
create table t1(a geometrycollection not null,spatial key(a))engine=innodb;
22
insert into t1(a) values( geometrycollection(multipolygon(polygon(linestring(point(-14,98), point(-14,98)), linestring(point(-97,64), point(-70,99), point(-97,64)), linestring(point(143851215403059150000000000000000000000.000000,13040009882500140000000000000000000000.000000), point(-73,85), point(-88,-29)))), multipolygon(polygon(linestring(point(41,95), point(4294967298,2050)), linestring(point(-61,85), point(-75,93), point(14,-2), point(1,84), point(-61,85)), linestring(point(-62,52), point(39,5), point(-18,12), point(-62,52))), polygon(linestring(point(-77,1), point(66,61), point(-77,1)), linestring(point(18446744073709551615,1125899906842622), point(-72,49), point(24,-66), point(82,73), point(68,22))), polygon(linestring(point(1048576,17179869181), point(-18,95), point(-90,-3), point(-33,82), point(20,-85)), linestring(point(-43,-97), point(-7,-3), point(39,-82), point(-65,-58), point(-43,-97)), linestring(point(44,-34), point(-69,58), point(44,-34)), linestring(point(57,-13), point(-17,74), point(57,-13)), linestring(point(3,71), point(-58,81), point(3,71)), linestring(point(9,25), point(77,-71), point(8388607,67108864), point(46,46), point(9,25)), linestring(point(98,-82), point(98,-82))))) ) ;
3-
ERROR 22023: Invalid GIS data provided to function polygon.
3+
Got one of the listed errors
44
insert into t1(a) values( geometrycollection(multilinestring(linestring(point(39,-60), point(-62,-11), point(-24,35), point(54,1)), linestring(point(-4,69), point(-22,-64), point(1.694824e+308,5.688896e+307), point(-33,-58), point(-64,-80), point(-15,-44), point(40,54)), linestring(point(-86,-54), point(11,41), point(-46,-38), point(-21,-8), point(10,70), point(-81,22), point(-46,-100)), linestring(point(-30,-48), point(50,58), point(-53,92), point(10,41), point(-46,-8)), linestring(point(-65,34), point(-92,93), point(-33,-74), point(75,-28)), linestring(point(25,-55), point(22,-10), point(-42,0), point(-86,-59), point(2,-37), point(63,-44), point(-55,-22)), linestring(point(28,0), point(-94,99), point(-32,-86)), linestring(point(9,-12), point(16,9), point(80,-73)), linestring(point(6,-55), point(83,-4)), linestring(point(-15,21), point(144115188075855876,16777212), point(-85,-31), point(-90,-50)), linestring(point(-33,33), point(21,90), point(-89,32)), linestring(point(16,24), point(73,-13), point(25,-48), point(71,52), point(-54,-78), point(-84,59), point(53,29)), linestring(point(-15,-81), point(83,43), point(-71,33), point(-8,0), point(84,-54), point(-35,38), point(-10,-50)), linestring(point(38,-50), point(20,-2), point(-57,-92)), linestring(point(5,-93), point(231601833467477080000000000000000000000.000000,51914987457169239000000000000000000000.000000), point(-94,62))), point(2,0)) ) ;
55
insert into t1(a) values( geometrycollection(multilinestring(linestring(point(80,-15), point(65,-57), point(-59,16), point(22,-67)), linestring(point(20,-55), point(-38,-64), point(19,-53), point(-63,-36), point(56,-37)), linestring(point(27,-8), point(-85,-75), point(4398046511106,2251799813685245)), linestring(point(45,32), point(-79,46))), multilinestring(linestring(point(8,-4), point(40,-38), point(100,95), point(5,-80), point(82,88)), linestring(point(-14,30), point(-94,51), point(-16,-29), point(37,-97), point(-26,92)), linestring(point(32,34), point(83,-23), point(-55,57), point(-15,90), point(32,-50), point(-20,-73), point(77,28)), linestring(point(4,88), point(87,74), point(-67,-58)), linestring(point(5.660747e+307,6.385657e+307), point(-58,-15), point(1.172095e+308,1.448533e+308)), linestring(point(-21,-37), point(-52,79), point(-16,-76), point(-65,-94), point(36,7), point(37,74), point(100,-57)), linestring(point(-23,-82), point(-73,23), point(18,-34)), linestring(point(20,-51), point(93,62), point(-65,84)), linestring(point(-48,31), point(-69,-96)), linestring(point(-5,78), point(10,-99), point(36,-33)), linestring(point(-84,55), point(96,1), point(-98,-29), point(-15,81), point(-27,-6), point(58,-32), point(54,-16)), linestring(point(2,5), point(2199023255553,8192)), linestring(point(12,-78), point(-97,-83)), linestring(point(-74,79), point(35,-56), point(50,95)), linestring(point(28,16), point(-39,-40), point(48,-3)), linestring(point(2199023255550,-65539), point(62,-25), point(94,-62)), linestring(point(-74,83), point(-18,75), point(91,17), point(-11,-48), point(30,100)), linestring(point(57,-13), point(88,-45)), linestring(point(20,-64), point(-37,13), point(20,35))), point(-3,-4)) ) ;
66
insert into t1(a) values( geometrycollection(multipolygon(polygon(linestring(point(-34,19), point(-25,92), point(61921390294166805000000000000000000000.000000,319674749161701840000000000000000000000.000000), point(56,50), point(-34,19)), linestring(point(-26,-58), point(99,-50), point(34,-20), point(-26,-58)), linestring(point(-42,45), point(-63,-7), point(5,-89), point(-97,36), point(-42,45)), linestring(point(94,11), point(-71,4), point(94,11)), linestring(point(16,25), point(4,-33), point(-45,-33), point(-64,-77), point(16,25)), linestring(point(19,45), point(36,45), point(-83,-96), point(19,45)), linestring(point(85,-31), point(-87,52), point(85,-31))), polygon(linestring(point(55,-88), point(63,-12), point(55,-88)), linestring(point(-49,10), point(-49,10)), linestring(point(-51,-32), point(-51,-32)))), multipolygon(polygon(linestring(point(-21,-8), point(66,-58), point(100,-27), point(-21,-8)), linestring(point(-29,-13), point(-29,-13))), polygon(linestring(point(91307574660224730000000000000000000000.000000,101214152547755520000000000000000000000.000000), point(89,64), point(77,87), point(66,29), point(-71,-53)), linestring(point(38,-78), point(-43,-90), point(37,20), point(81,65), point(38,-78))), polygon(linestring(point(51,0), point(-62,8), point(-11,22), point(51,0)), linestring(point(-4,-44), point(6,82), point(-19,-90), point(131,32)))), point(-4,-7)) ) ;
7-
ERROR 22023: Invalid GIS data provided to function polygon.
7+
Got one of the listed errors
88
insert into t1(a) values( geometrycollection(point(10,9), linestring(point(2305843009213693955,-1125899906842621), point(78,15)), multipoint(point(-1,3), point(4,-6))) ) ;
99
insert into t1(a) values( geometrycollection(polygon(linestring(point(0,13), point(-12,5), point(0,13)), linestring(point(11,-2), point(6,6), point(20,-14), point(-3,-10), point(1.330588e+308,2.666476e+307)), linestring(point(16382,67), point(7,4)), linestring(point(2,7), point(-14,15), point(2,7)), linestring(point(-14,12), point(-8,-8), point(-17,-2), point(-14,12)), linestring(point(-20,-10), point(-8,-13), point(-19,-17), point(13,-3), point(-20,-10)), linestring(point(-5,13), point(7,-9), point(6,8), point(-5,13))), linestring(point(-87,19), point(-64,51), point(-16,12)), multipoint(point(-1,-10), point(2,-10), point(3.670354e+307,2.501459e+307))) ) ;
10-
ERROR 22023: Invalid GIS data provided to function polygon.
11-
insert into t1(a) values( geometrycollection(multipoint(point(-3,7), point(4,-3), point(-6,-2), point(-9,1)), polygon(linestring(point(-17,-5), point(2,-8), point(-6,9), point(-9,19), point(-17,-5)), linestring(point(10,-1), point(15,-7), point(-13,6), point(10,-1))), multipolygon(polygon(linestring(point(69,-69), point(-90,-64), point(-17,4), point(47,-73), point(69,-69)), linestring(point(-35,-77), point(-35,-77)), linestring(point(95,-76), point(1.636688e+308,1.828723e+307), point(68719476740,536870916), point(95,-76)), linestring(point(-26,-85), point(-26,-85)), linestring(point(-53,57), point(-53,57)), linestring(point(-98,-64), point(79,-57), point(-98,-64)), linestring(point(-91,59), point(16,0), point(73,97), point(-35,-70), point(-91,59))))) ) ;
12-
ERROR 22023: Invalid GIS data provided to function polygon.
10+
Got one of the listed errors
1311
insert into t1(a) values( geometrycollection(linestring(point(85,-29), point(15,84), point(39,-92), point(-99,19)), multilinestring(linestring(point(63,10), point(-47,95), point(10,-49), point(16,-65), point(-98,40), point(25,44), point(-55,-92)), linestring(point(5.266810e+307,6.648813e+307), point(47,33), point(-15,-13), point(-92,-58), point(36,73)), linestring(point(77,-56), point(-53,-10), point(-28,76), point(-51,6), point(51,-31), point(-95,81), point(92,26)), linestring(point(-91,7), point(58,53)), linestring(point(18,5), point(18,40), point(71,89), point(7.898707e+307,1.202585e+308), point(53,100)), linestring(point(-60,-18), point(-10,-31), point(-6,-25), point(-57,-95), point(16,77)))) ) ;
1412
insert into t1(a) values( geometrycollection(polygon(linestring(point(-9,0), point(-17,-15), point(-9,0)), linestring(point(-11,1), point(18,12), point(15,3), point(7,0), point(-11,1)), linestring(point(19,5), point(19,5)), linestring(point(17,-11), point(8,4), point(17,-11)), linestring(point(14914539334033432000000000000000000000.000000,127247994336690690000000000000000000000.000000), point(-14,-7), point(13,-2))), point(-4,-7), polygon(linestring(point(-18,9), point(11,-1), point(-18,9)), linestring(point(9,-3), point(9,-3)), linestring(point(-7,-9), point(9,-11), point(11,14), point(1.663324e+308,1.572127e+308)), linestring(point(-15,4), point(18,12), point(7,2), point(-15,4)), linestring(point(-15,-18), point(-20,-15), point(1152921504606846972,34359738370))), polygon(linestring(point(-5,-19), point(-11,11), point(10,5), point(-7,13), point(-5,-19)), linestring(point(-8,-6), point(-4,16), point(-8,-6)), linestring(point(-6,-10), point(3,-12), point(-6,-10)), linestring(point(-16,1), point(20,-12), point(-16,1)), linestring(point(-8,5), point(-20,-4), point(4,1), point(-6,-6), point(-8,5)), linestring(point(-8,-11), point(-5,-14), point(-8,-11)), linestring(point(3,-16), point(-15,-13), point(1.166708e+308,1.901147e+307), point(-8,6), point(3,-16))), point(0,-5)) ) ;
15-
ERROR 22023: Invalid GIS data provided to function polygon.
13+
Got one of the listed errors
1614
insert into t1(a) values( geometrycollection(linestring(point(-33,99), point(99,-87), point(38,-79), point(33,-39), point(-91,-8), point(46,-87))) ) ;
1715
insert into t1 select * from t1;
1816
insert into t1 select * from t1;

‎mysql-test/suite/innodb_gis/r/innodb_gis_rtree.result

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1576,13 +1576,13 @@ INSERT INTO t1 VALUES(GeomFromText('LINESTRING(2 2, 3 3)'));
15761576
SELECT COUNT(*) FROM t1 IGNORE INDEX(l) WHERE MBRContains(l, GEOMFROMTEXT('POINT(0 0)'));
15771577
COUNT(*)
15781578
1
1579-
SELECT COUNT(*) FROM t1 IGNORE INDEX(l) WHERE MBRWithin(GEOMFROMTEXT('POINT(0 0)'), l);
1579+
SELECT COUNT(*) FROM t1 IGNORE INDEX(l) WHERE MBRWithin(GEOMFROMTEXT('POINT(0.5 0.5)'), l);
15801580
COUNT(*)
15811581
1
15821582
SELECT COUNT(*) FROM t1 FORCE INDEX(l) WHERE MBRContains(l, GEOMFROMTEXT('POINT(0 0)'));
15831583
COUNT(*)
15841584
1
1585-
SELECT COUNT(*) FROM t1 FORCE INDEX(l) WHERE MBRWithin(GEOMFROMTEXT('POINT(0 0)'), l);
1585+
SELECT COUNT(*) FROM t1 FORCE INDEX(l) WHERE MBRWithin(GEOMFROMTEXT('POINT(0.5 0.5)'), l);
15861586
COUNT(*)
15871587
1
15881588
DROP TABLE t1;

‎mysql-test/suite/innodb_gis/r/point_basic.result

Lines changed: 2 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -144,7 +144,6 @@ POINT(1 0) POINT(10 20)
144144
POINT(0 0) POINT(10 20)
145145
SELECT ST_AsText(p), ST_AsText(p1) FROM t1 WHERE MBRWithin(p, ST_GeomFromText('POLYGON((-1 0.5, -1 -0.5, 1 -0.5, 1 0.5, -1 0.5))'));
146146
ST_AsText(p) ST_AsText(p1)
147-
POINT(1 0) POINT(10 20)
148147
POINT(0 0) POINT(10 20)
149148
# Drop spatial keys on the table
150149
ALTER TABLE t1 DROP KEY p, DROP KEY p1;
@@ -170,7 +169,6 @@ POINT(1 0) POINT(10 20)
170169
POINT(0 0) POINT(10 20)
171170
SELECT ST_AsText(p), ST_AsText(p1) FROM t1 WHERE MBRWithin(p, ST_GeomFromText('POLYGON((-1 0.5, -1 -0.5, 1 -0.5, 1 0.5, -1 0.5))'));
172171
ST_AsText(p) ST_AsText(p1)
173-
POINT(1 0) POINT(10 20)
174172
POINT(0 0) POINT(10 20)
175173
TRUNCATE t1;
176174
ALTER TABLE t1 DROP COLUMN p, DROP COLUMN p1;
@@ -203,10 +201,8 @@ SELECT ST_AsText(p), ST_AsText(p1) FROM t1 WHERE MBRWithin(p1, ST_GeomFromText('
203201
ST_AsText(p) ST_AsText(p1)
204202
POINT(0 1) POINT(10 19)
205203
POINT(1 1) POINT(10 20)
206-
POINT(1 0) POINT(10 21)
207204
SELECT ST_AsText(p), ST_AsText(p1) FROM t1 WHERE MBRWithin(p, ST_GeomFromText('POLYGON((-1 0.5, -1 -0.5, 1 -0.5, 1 0.5, -1 0.5))'));
208205
ST_AsText(p) ST_AsText(p1)
209-
POINT(1 0) POINT(10 21)
210206
POINT(0 0) POINT(10 22)
211207
ALTER TABLE t1 DROP COLUMN p1, ADD COLUMN p1 POINT, CHANGE COLUMN p pp POINT AFTER p1;
212208
SELECT name, mtype, prtype, len FROM INFORMATION_SCHEMA.INNODB_SYS_COLUMNS WHERE name = 'pp' OR name = 'g' OR name = 'p1';
@@ -234,14 +230,9 @@ SELECT ST_AsText(pp), ST_AsText(p1) FROM t1 WHERE p1 = ST_PointFromText('POINT(1
234230
ST_AsText(pp) ST_AsText(p1)
235231
SELECT ST_AsText(pp), ST_AsText(p1) FROM t1 WHERE MBRWithin(p1, ST_GeomFromText('POLYGON((5 5, 20 5, 20 21, 5 21, 5 5))')) ORDER BY pp;
236232
ST_AsText(pp) ST_AsText(p1)
237-
POINT(0 0) POINT(5 5)
238-
POINT(0 1) POINT(5 5)
239-
POINT(1 0) POINT(5 5)
240-
POINT(1 1) POINT(5 5)
241233
SELECT ST_AsText(pp), ST_AsText(p1) FROM t1 WHERE MBRWithin(pp, ST_GeomFromText('POLYGON((-1 0.5, -1 -0.5, 1 -0.5, 1 0.5, -1 0.5))')) ORDER BY pp;
242234
ST_AsText(pp) ST_AsText(p1)
243235
POINT(0 0) POINT(5 5)
244-
POINT(1 0) POINT(5 5)
245236
DROP TABLE t1;
246237
#
247238
# Test when the POINT is on B-TREE
@@ -477,10 +468,8 @@ ST_AsText(p1)
477468
POINT(5 10)
478469
SELECT ST_AsText(p1) FROM gis_point1 WHERE MBRWithin(p1, @poly1);
479470
ST_AsText(p1)
480-
POINT(2 4)
481471
POINT(3 6)
482472
POINT(4 8)
483-
POINT(5 10)
484473
SELECT ST_AsText(p2) FROM gis_point1 WHERE ST_Contains(@poly2, p2);
485474
ST_AsText(p2)
486475
POINT(-1 -3)
@@ -509,6 +498,7 @@ POINT(10 21)
509498
POINT(20.5 41)
510499
SELECT ST_AsText(p1) FROM gis_point1 WHERE ST_Contains(@mpoly, p1) AND NOT MBRWithin(p1, @mpoly);
511500
ST_AsText(p1)
501+
POINT(3 6)
512502
# Check functions that use MBR, with line type data
513503
SELECT ST_AsText(p1) FROM gis_point1 WHERE MBRIntersects(p1, @ls1);
514504
ST_AsText(p1)
@@ -558,10 +548,8 @@ POINT(4 8)
558548
POINT(5 10)
559549
SELECT ST_AsText(p1) FROM gis_point1 WHERE MBRWithin(p1, @poly1);
560550
ST_AsText(p1)
561-
POINT(2 4)
562551
POINT(3 6)
563552
POINT(4 8)
564-
POINT(5 10)
565553
SELECT ST_AsText(p1) FROM gis_point1 WHERE ST_Touches(p1, @poly1);
566554
ST_AsText(p1)
567555
POINT(2 4)
@@ -684,10 +672,8 @@ POINT(4 8)
684672
POINT(5 10)
685673
SELECT ST_AsText(p1) FROM gis_point1 WHERE MBRWithin(p1, @poly1);
686674
ST_AsText(p1)
687-
POINT(2 4)
688675
POINT(3 6)
689676
POINT(4 8)
690-
POINT(5 10)
691677
SELECT ST_AsText(p1) FROM gis_point1 WHERE ST_Touches(p1, @poly1);
692678
ST_AsText(p1)
693679
POINT(2 4)
@@ -769,10 +755,8 @@ ST_AsText(p1)
769755
POINT(5 10)
770756
SELECT ST_AsText(p1) FROM gis_point WHERE MBRWithin(p1, @poly1);
771757
ST_AsText(p1)
772-
POINT(2 4)
773758
POINT(3 6)
774759
POINT(4 8)
775-
POINT(5 10)
776760
SELECT ST_AsText(p2) FROM gis_point WHERE ST_Contains(@poly2, p2);
777761
ST_AsText(p2)
778762
POINT(-1 -3)
@@ -801,6 +785,7 @@ POINT(10 21)
801785
POINT(20.5 41)
802786
SELECT ST_AsText(p1) FROM gis_point WHERE ST_Contains(@mpoly, p1) AND NOT MBRWithin(p1, @mpoly);
803787
ST_AsText(p1)
788+
POINT(3 6)
804789
# Check functions that use MBR, with line type data
805790
SELECT ST_AsText(p1) FROM gis_point WHERE MBRIntersects(p1, @ls1);
806791
ST_AsText(p1)
@@ -850,10 +835,8 @@ POINT(4 8)
850835
POINT(5 10)
851836
SELECT ST_AsText(p1) FROM gis_point WHERE MBRWithin(p1, @poly1);
852837
ST_AsText(p1)
853-
POINT(2 4)
854838
POINT(3 6)
855839
POINT(4 8)
856-
POINT(5 10)
857840
SELECT ST_AsText(p1) FROM gis_point WHERE ST_Touches(p1, @poly1);
858841
ST_AsText(p1)
859842
POINT(2 4)
@@ -976,10 +959,8 @@ POINT(4 8)
976959
POINT(5 10)
977960
SELECT ST_AsText(p1) FROM gis_point WHERE MBRWithin(p1, @poly1);
978961
ST_AsText(p1)
979-
POINT(2 4)
980962
POINT(3 6)
981963
POINT(4 8)
982-
POINT(5 10)
983964
SELECT ST_AsText(p1) FROM gis_point WHERE ST_Touches(p1, @poly1);
984965
ST_AsText(p1)
985966
POINT(2 4)
@@ -1091,10 +1072,8 @@ POINT(4 8)
10911072
POINT(5 10)
10921073
SELECT ST_AsText(p1) FROM gis_point WHERE MBRWithin(p1, @poly1);
10931074
ST_AsText(p1)
1094-
POINT(2 4)
10951075
POINT(3 6)
10961076
POINT(4 8)
1097-
POINT(5 10)
10981077
SELECT ST_AsText(p1) FROM gis_point WHERE ST_Touches(p1, @poly1);
10991078
ST_AsText(p1)
11001079
POINT(2 4)
@@ -1217,10 +1196,8 @@ POINT(4 8)
12171196
POINT(5 10)
12181197
SELECT ST_AsText(p1) FROM gis_point WHERE MBRWithin(p1, @poly1);
12191198
ST_AsText(p1)
1220-
POINT(2 4)
12211199
POINT(3 6)
12221200
POINT(4 8)
1223-
POINT(5 10)
12241201
SELECT ST_AsText(p1) FROM gis_point WHERE ST_Touches(p1, @poly1);
12251202
ST_AsText(p1)
12261203
POINT(2 4)

‎mysql-test/suite/innodb_gis/r/rtree.result

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,14 +15,14 @@ select ST_astext(t1.g) from t1 where MBRWithin(t1.g, @g1);
1515
ST_astext(t1.g)
1616
POINT(1 1)
1717
POINT(1.5 1.5)
18-
POINT(3 3)
1918
set @g1 = ST_GeomFromText('Polygon((0 0,0 3,3 3,3 0,0 0))');
2019
delete from t1 where MBRWithin(t1.g, @g1);
2120
check table t1;
2221
Table Op Msg_type Msg_text
2322
test.t1 check status OK
2423
select ST_astext(t1.g) from t1;
2524
ST_astext(t1.g)
25+
POINT(3 3)
2626
POINT(3.1 3.1)
2727
POINT(5 5)
2828
set @g1 = ST_GeomFromText('Polygon((5 5,5 5,5 5,5 5,5 5))');
@@ -32,6 +32,7 @@ Table Op Msg_type Msg_text
3232
test.t1 check status OK
3333
select ST_astext(t1.g) from t1;
3434
ST_astext(t1.g)
35+
POINT(3 3)
3536
POINT(3.1 3.1)
3637
POINT(2 2)
3738
show indexes from t1;
@@ -159,14 +160,14 @@ select ST_astext(t1.g) from t1 where MBRWithin(t1.g, @g1);
159160
ST_astext(t1.g)
160161
POINT(1 1)
161162
POINT(1.5 1.5)
162-
POINT(3 3)
163163
set @g1 = ST_GeomFromText('Polygon((0 0,0 3,3 3,3 0,0 0))');
164164
delete from t1 where MBRWithin(t1.g, @g1);
165165
check table t1;
166166
Table Op Msg_type Msg_text
167167
test.t1 check status OK
168168
select ST_astext(t1.g) from t1;
169169
ST_astext(t1.g)
170+
POINT(3 3)
170171
POINT(3.1 3.1)
171172
POINT(5 5)
172173
set @g1 = ST_GeomFromText('Polygon((5 5,5 5,5 5,5 5,5 5))');
@@ -176,6 +177,7 @@ Table Op Msg_type Msg_text
176177
test.t1 check status OK
177178
select ST_astext(t1.g) from t1;
178179
ST_astext(t1.g)
180+
POINT(3 3)
179181
POINT(3.1 3.1)
180182
POINT(2 2)
181183
show indexes from t1;

0 commit comments

Comments
 (0)