database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-27 18:02:13 +03:00
Code Activity

Merge 10.11 into 11.0

Browse Source
This commit is contained in:
Marko Mäkelä
2023-11-24 11:20:56 +02:00
parent edb98da79a a48c1b89c8
commit 5b6134b040
165 changed files with 2019 additions and 450 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
mysql-test/suite/innodb_gis/t/rtree_add_index.test
View File

@ -1,6 +1,6 @@
--source include/have_innodb.inc
CREATE TABLE t1 (g MULTIPOINT NOT NULL) ENGINE=InnoDB;
CREATE TABLE t1 (g MULTIPOINT NOT NULL) ENGINE=InnoDB STATS_PERSISTENT=0;
INSERT INTO t1 VALUES ('');
connect purge_control,localhost,root;

6
mysql-test/suite/innodb_gis/t/rtree_compress.test
View File

@ -10,9 +10,11 @@
# Valgrind takes too much time on PB2 even in the --big-test runs.
--source include/not_valgrind.inc
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb ROW_FORMAT=COMPRESSED;
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb ROW_FORMAT=COMPRESSED STATS_PERSISTENT=0;
# Insert enough values to let R-tree split.
lock tables t1 write;
start transaction;
insert into t1 values(1, Point(1,1));
insert into t1 values(2, Point(2,2));
insert into t1 values(3, Point(3,3));
@ -33,6 +35,8 @@ insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
insert into t1 select * from t1;
commit;
unlock tables;
start transaction;
insert into t1 select * from t1;
select count(*) from t1;

2
mysql-test/suite/innodb_gis/t/rtree_purge.test
View File

@ -8,7 +8,7 @@
create table t (
b point not null,d point not null, spatial key (d),spatial key (b)
) engine=innodb;
) engine=innodb stats_persistent=0;
--disable_query_log
set @p=point(1,1);

4
mysql-test/suite/innodb_gis/t/rtree_undo.test
View File

@ -17,7 +17,7 @@ CREATE TABLE t1 (
p INT NOT NULL AUTO_INCREMENT,
g LINESTRING NOT NULL,
PRIMARY KEY(p)
) ENGINE=InnoDB;
) ENGINE=InnoDB STATS_PERSISTENT=0;
if ($index == 3) {
eval ALTER TABLE t1 ADD INDEX prefix_idx (g($prefix_size));
@ -88,7 +88,7 @@ CREATE TABLE t2 (
SPATIAL KEY (g4),
SPATIAL KEY (g5),
SPATIAL KEY (g6)
) ENGINE=InnoDB;
) ENGINE=InnoDB STATS_PERSISTENT=0;
DROP TABLE t1,t2;