mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-17 12:27:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch '10.6' into 10.10

Browse source
This commit is contained in:
Oleksandr Byelkin 2023-11-08 16:22:42 +01:00
commit 04d9a46c41
537 changed files with 11973 additions and 7616 deletions
Download patch file Download diff file Expand all files Collapse all files

3
mysql-test/suite/versioning/r/delete_history.result
View file

@ -1,5 +1,3 @@
set @saved_frequency= @@global.innodb_purge_rseg_truncate_frequency;
set global innodb_purge_rseg_truncate_frequency= 1;
call mtr.add_suppression("need more HISTORY partitions");
create table t (a int);
delete history from t before system_time now();
@ -210,7 +208,6 @@ insert into t1 values (1, 'c');
delete from t1;
alter table t1 add fulltext key(ftx);
drop table t1;
set global innodb_purge_rseg_truncate_frequency= @saved_frequency;
#
# MDEV-28201 Server crashes upon SHOW ANALYZE/EXPLAIN FORMAT=JSON
#

5
mysql-test/suite/versioning/t/delete_history.test
View file

@ -2,9 +2,6 @@
--source include/have_partition.inc
--source suite/versioning/engines.inc
set @saved_frequency= @@global.innodb_purge_rseg_truncate_frequency;
set global innodb_purge_rseg_truncate_frequency= 1;
call mtr.add_suppression("need more HISTORY partitions");
create table t (a int);
@ -215,8 +212,6 @@ delete from t1;
alter table t1 add fulltext key(ftx);
drop table t1;
set global innodb_purge_rseg_truncate_frequency= @saved_frequency;
--echo #
--echo # MDEV-28201 Server crashes upon SHOW ANALYZE/EXPLAIN FORMAT=JSON
--echo #

2
mysql-test/suite/versioning/t/trx_id.opt Normal file
View file

@ -0,0 +1,2 @@
--log_bin
--binlog_do_db=foo