Followup:BUG#21245805 HA_INNOBASE::RECORDS_IN_RANGE() RETURNS CONSTANT

FOR SPATIAL INDEXES

Fix innodb_gis.rtree_concurrent_srch and innodb_gis.rtree_old failures
with 4k page size.

Author: Shaohua Wang

mysql-test/suite/innodb_gis/r/rtree_concurrent_srch.result

@@ -14,6 +14,7 @@ insert into t1 select * from t1;
 insert into t1 select * from t1;
 insert into t1 select * from t1;
 insert into t1 select * from t1;
+SET SESSION debug="+d,rtr_pcur_move_to_next_return";
 set session transaction isolation level serializable;
 set @g1 = ST_GeomFromText('Polygon((0 0,0 100,100 100,100 0,0 0))');
 SET DEBUG_SYNC = 'RESET';
@@ -217,6 +218,7 @@ select sleep(2);
 sleep(2)
 0
 commit;
+SET SESSION debug="-d,rtr_pcur_move_to_next_return";
 drop table t1;
 drop procedure insert_t1;
 create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb;
@@ -227,6 +229,7 @@ INSERT INTO t1  VALUES (1, ST_GeomFromText('LineString(5 5, 180 180)'));
 INSERT INTO t1  VALUES (1, ST_GeomFromText('LineString(6 6, 190 190)'));
 INSERT INTO t1  VALUES (1, ST_GeomFromText('LineString(7 7, 200 200)'));
 INSERT INTO t1  VALUES (1, ST_GeomFromText('LineString(8 8, 210 210)'));
+SET SESSION debug="+d,rtr_pcur_move_to_next_return";
 set transaction isolation level serializable;
 start transaction;
 set @g1 = ST_GeomFromText('Polygon((100 100, 100 110, 110 110, 110 100, 100 100))');
@@ -296,15 +299,14 @@ end|
 start transaction;
 CALL insert_t1(100);
 set @g1 = ST_GeomFromText('Polygon((0 0,0 1000,1000 1000,1000 0,0 0))');
-SET SESSION debug="+d,rtr_pcur_move_to_next_return";
 SET DEBUG_SYNC= 'rtr_pcur_move_to_next_return SIGNAL siga WAIT_FOR sigb';
 select count(*) from t1 where MBRWithin(t1.c2, @g1);;
 SET DEBUG_SYNC= 'now WAIT_FOR siga';
 rollback;
 SET DEBUG_SYNC= 'now SIGNAL sigb';
 count(*)
 0
-SET SESSION debug="-d,rtr_pcur_move_to_next_return";
 drop procedure insert_t1;
 DROP TABLE t1;
+SET SESSION debug="-d,rtr_pcur_move_to_next_return";
 SET DEBUG_SYNC = 'RESET';

mysql-test/suite/innodb_gis/r/rtree_old.result

@@ -165,11 +165,6 @@ INSERT INTO t1 (g) VALUES (ST_GeomFromText('LineString(1 1, 299 299)'));
 SELECT count(*) FROM t1;
 count(*)
 150
-EXPLAIN SELECT fid, ST_AsText(g) FROM t1 WHERE MBRWithin(g, ST_GeomFromText('Polygon((140 140,160 140,160 160,140 160,140 140))')) ORDER BY fid;
-id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	filtered	Extra
-1	SIMPLE	t1	NULL	range	g	g	34	NULL	19	100.00	Using where; Using filesort
-Warnings:
-Note	1003	/* select#1 */ select `test`.`t1`.`fid` AS `fid`,st_astext(`test`.`t1`.`g`) AS `ST_AsText(g)` from `test`.`t1` where mbrwithin(`test`.`t1`.`g`,<cache>(st_geometryfromtext('Polygon((140 140,160 140,160 160,140 160,140 140))'))) order by `test`.`t1`.`fid`
 SELECT fid, ST_AsText(g) FROM t1 WHERE MBRWithin(g, ST_GeomFromText('Polygon((140 140,160 140,160 160,140 160,140 140))')) ORDER BY fid;
 fid	ST_AsText(g)
 1	LINESTRING(150 150,150 150)

mysql-test/suite/innodb_gis/t/rtree_concurrent_srch.test

@@ -33,6 +33,7 @@ insert into t1 select * from t1;
 
 connect (a,localhost,root,,);
 connection a;
+SET SESSION debug="+d,rtr_pcur_move_to_next_return";
 
 set session transaction isolation level serializable;
 set @g1 = ST_GeomFromText('Polygon((0 0,0 100,100 100,100 0,0 0))');
@@ -293,6 +294,7 @@ select sleep(2);
 commit;
 
 connection a;
+SET SESSION debug="-d,rtr_pcur_move_to_next_return";
 disconnect a;
 --source include/wait_until_disconnected.inc
 
@@ -320,6 +322,7 @@ INSERT INTO t1  VALUES (1, ST_GeomFromText('LineString(8 8, 210 210)'));
 
 connect (a,localhost,root,,);
 connection a;
+SET SESSION debug="+d,rtr_pcur_move_to_next_return";
 
 set transaction isolation level serializable;
 start transaction;
@@ -419,7 +422,6 @@ CALL insert_t1(100);
 
 connection a;
 set @g1 = ST_GeomFromText('Polygon((0 0,0 1000,1000 1000,1000 0,0 0))');
-SET SESSION debug="+d,rtr_pcur_move_to_next_return";
 SET DEBUG_SYNC= 'rtr_pcur_move_to_next_return SIGNAL siga WAIT_FOR sigb';
 --send select count(*) from t1 where MBRWithin(t1.c2, @g1);
 
@@ -431,13 +433,13 @@ SET DEBUG_SYNC= 'now SIGNAL sigb';
 
 connection a;
 --reap;
-SET SESSION debug="-d,rtr_pcur_move_to_next_return";
 
 connection default;
 drop procedure insert_t1;
 DROP TABLE t1;
 
 connection a;
+SET SESSION debug="-d,rtr_pcur_move_to_next_return";
 disconnect a;
 --source include/wait_until_disconnected.inc
 

mysql-test/suite/innodb_gis/t/rtree_old.test

@@ -27,7 +27,6 @@ while ($1)
 }
 
 SELECT count(*) FROM t1;
-EXPLAIN SELECT fid, ST_AsText(g) FROM t1 WHERE MBRWithin(g, ST_GeomFromText('Polygon((140 140,160 140,160 160,140 160,140 140))')) ORDER BY fid;
 SELECT fid, ST_AsText(g) FROM t1 WHERE MBRWithin(g, ST_GeomFromText('Polygon((140 140,160 140,160 160,140 160,140 140))')) ORDER BY fid;
 
 DROP TABLE t1;