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 11.2 into 11.4

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 14:32:14 +03:00
parent 90f090f22c 12a91b57e2
commit b53b81e937
560 changed files with 5796 additions and 1398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/innodb_gis/t/1.test
View File

@ -408,7 +408,10 @@ select (ST_asWKT(ST_geomfromwkb((0x010100000000000000000024400000000000002440)))
--enable_metadata
create table t1 (g GEOMETRY);
select * from t1;
#Check after fix MDEV-31540
--disable_cursor_protocol
select ST_asbinary(g) from t1;
--enable_cursor_protocol
--disable_metadata
--enable_view_protocol
drop table t1;

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

@ -398,11 +398,14 @@ select (ST_asWKT(ST_geomfromwkb((0x000000000140240000000000004024000000000000)))
select (ST_asWKT(ST_geomfromwkb((0x010100000000000000000024400000000000002440)))) AS val;
--disable_view_protocol
#check after fix MDEV-31540
--disable_cursor_protocol
--enable_metadata
create table t1 (g GEOMETRY);
select * from t1;
select ST_asbinary(g) from t1;
--disable_metadata
--enable_cursor_protocol
--enable_view_protocol
drop table t1;
@ -1440,7 +1443,9 @@ SELECT ST_Union('', ''), md5(1);
--echo # fields after MDEV-25459
--echo #
CREATE TABLE t1(l LINESTRING NOT NULL, SPATIAL INDEX(l))ENGINE=InnoDB;
--disable_cursor_protocol
SELECT GROUP_CONCAT(CONCAT(seq, ' ', seq) SEPARATOR ',') INTO @g FROM seq_0_to_504;
--enable_cursor_protocol
INSERT INTO t1 SET l=ST_GeomFromText(CONCAT('LINESTRING(',@g,',0 0)'));
SELECT COUNT(*) FROM t1 WHERE MBRIntersects(GeomFromText('Polygon((0 0,0 10,10 10,10 0,0 0))'), l);
DROP TABLE t1;