database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge 10.2 into bb-10.2-ext

Browse Source
This commit is contained in:
Marko Mäkelä
2018-01-30 20:18:25 +02:00
parent 8317ce73d4 446b3d3562
commit 6d390bab4a
24 changed files with 86 additions and 83 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/suite/innodb_gis/t/rtree_debug.test
View File

@ -49,10 +49,11 @@ create spatial index idx on t1(c2);
show create table t1;
SET DEBUG='+d,row_merge_ins_spatial_fail';
SET @save_dbug = @@SESSION.debug_dbug;
SET debug_dbug='+d,row_merge_ins_spatial_fail';
--error ER_GET_ERRNO
create spatial index idx2 on t1(c2);
SET DEBUG='-d,row_merge_ins_spatial_fail';
SET debug_dbug = @save_dbug;
show create table t1;
# Check table.

5
mysql-test/suite/innodb_gis/t/rtree_search.test
View File

@ -38,9 +38,10 @@ select count(*) from t1 where MBRWithin(t1.c2, @g1);
set @g1 = ST_GeomFromText('Polygon((100 100,100 800,800 800,800 100,100 100))');
select count(*) from t1 where MBRWithin(t1.c2, @g1);
#SET DEBUG='+d, rtr_pessimistic_position';
#SET @save_dbug= @@session.debug_dbug;
#SET debug_dbug = '+d,rtr_pessimistic_position';
#select count(*) from t1 where MBRWithin(t1.c2, @g1);
#SET DEBUG='-d, rtr_pessimistic_position';
#SET debug_dbug = @save_dbug;
# Equality search
set @g1 = ST_GeomFromText('Point(1 1)');