database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-31 22:22:30 +03:00
Code Activity

Merge tag '11.1' into 11.2

Browse Source 
MariaDB 11.1.3 release
This commit is contained in:
Oleksandr Byelkin
2023-11-14 18:28:37 +01:00
parent e6acddf121 0f5613a25f
commit 0427c4739e
608 changed files with 15628 additions and 9174 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
mysql-test/suite/innodb_gis/r/rtree_add_index.result
View File

@@ -1,5 +1,3 @@
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
CREATE TABLE t1 (g MULTIPOINT NOT NULL) ENGINE=InnoDB;
INSERT INTO t1 VALUES ('');
connect purge_control,localhost,root;
@@ -10,4 +8,3 @@ ALTER TABLE t1 ADD SPATIAL INDEX (g);
disconnect purge_control;
InnoDB 0 transactions not purged
DROP TABLE t1;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;

3
mysql-test/suite/innodb_gis/r/rtree_compress.result
View File

@@ -1,5 +1,3 @@
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb ROW_FORMAT=COMPRESSED;
insert into t1 values(1, Point(1,1));
insert into t1 values(2, Point(2,2));
@@ -51,4 +49,3 @@ count(*)
SET debug_dbug = @saved_dbug;
InnoDB 0 transactions not purged
drop table t1;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;

3
mysql-test/suite/innodb_gis/r/rtree_purge.result
View File

@@ -1,8 +1,5 @@
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
create table t (
b point not null,d point not null, spatial key (d),spatial key (b)
) engine=innodb;
InnoDB 0 transactions not purged
drop table t;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;

3
mysql-test/suite/innodb_gis/r/rtree_undo.result
View File

@@ -1,5 +1,3 @@
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
connect control_purge,localhost,root,,;
connection default;
CREATE TABLE t1 (
@@ -136,4 +134,3 @@ SPATIAL KEY (g6)
) ENGINE=InnoDB;
DROP TABLE t1,t2;
disconnect control_purge;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;

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

@@ -1,8 +1,5 @@
--source include/have_innodb.inc
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
CREATE TABLE t1 (g MULTIPOINT NOT NULL) ENGINE=InnoDB;
INSERT INTO t1 VALUES ('');
@@ -17,4 +14,3 @@ ALTER TABLE t1 ADD SPATIAL INDEX (g);
disconnect purge_control;
--source ../../innodb/include/wait_all_purged.inc
DROP TABLE t1;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;

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

@@ -10,9 +10,6 @@
# Valgrind takes too much time on PB2 even in the --big-test runs.
--source include/not_valgrind.inc
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
create table t1 (c1 int, c2 geometry not null, spatial index (c2))engine=innodb ROW_FORMAT=COMPRESSED;
# Insert enough values to let R-tree split.
@@ -61,4 +58,3 @@ SET debug_dbug = @saved_dbug;
# Clean up.
drop table t1;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;

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

@@ -6,9 +6,6 @@
# This test often times out with MSAN
--source include/not_msan.inc
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
create table t (
b point not null,d point not null, spatial key (d),spatial key (b)
) engine=innodb;
@@ -29,4 +26,3 @@ dec $n;
# Clean up.
drop table t;
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;

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

@@ -6,9 +6,6 @@
--source include/innodb_row_format.inc
--source include/count_sessions.inc
SET @saved_frequency = @@GLOBAL.innodb_purge_rseg_truncate_frequency;
SET GLOBAL innodb_purge_rseg_truncate_frequency = 1;
connect (control_purge,localhost,root,,);
connection default;
@@ -100,5 +97,3 @@ dec $index;
disconnect control_purge;
--source include/wait_until_count_sessions.inc
SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;