Merge branch '11.2' into 11.3

2025-08-08 11:22:35 +03:00 · 2023-11-14 18:33:03 +01:00
parent 22ffe4dd22 0427c4739e
commit 34272bd6a5
618 changed files with 17156 additions and 9729 deletions
--- a/mysql-test/suite/encryption/t/innodb-bad-key-change.opt
+++ b/mysql-test/suite/encryption/t/innodb-bad-key-change.opt
@@ -1,2 +1 @@
--innodb-purge-rseg-truncate-frequency=1
 --skip-innodb-fast-shutdown
--- a/mysql-test/suite/encryption/t/innodb-bad-key-change2.opt
+++ b/mysql-test/suite/encryption/t/innodb-bad-key-change2.opt
@@ -1,2 +1 @@
--innodb-purge-rseg-truncate-frequency=1
 --skip-innodb-fast-shutdown
--- a/mysql-test/suite/encryption/t/innodb-compressed-blob.opt
+++ b/mysql-test/suite/encryption/t/innodb-compressed-blob.opt
@@ -2,5 +2,4 @@
 --innodb-tablespaces-encryption
 --innodb-encrypt-tables=on
 --innodb-encryption-threads=4
--innodb-purge-rseg-truncate-frequency=1
 --skip-innodb-fast-shutdown
--- a/mysql-test/suite/encryption/t/innodb-encryption-disable.opt
+++ b/mysql-test/suite/encryption/t/innodb-encryption-disable.opt
@@ -1,2 +1 @@
--innodb-purge-rseg-truncate-frequency=1
 --skip-innodb-fast-shutdown
--- a/mysql-test/suite/encryption/t/innodb-force-corrupt.opt
+++ b/mysql-test/suite/encryption/t/innodb-force-corrupt.opt
@@ -1,2 +1 @@
--innodb-purge-rseg-truncate-frequency=1
 --skip-innodb-fast-shutdown
--- a/mysql-test/suite/encryption/t/innodb-missing-key.opt
+++ b/mysql-test/suite/encryption/t/innodb-missing-key.opt
@@ -2,5 +2,4 @@
 --innodb-encryption-rotate-key-age=15
 --innodb-encryption-threads=4
 --innodb-tablespaces-encryption
--innodb-purge-rseg-truncate-frequency=1
 --skip-innodb-fast-shutdown
--- a/mysql-test/suite/encryption/t/innodb-redo-badkey.opt
+++ b/mysql-test/suite/encryption/t/innodb-redo-badkey.opt
@@ -2,5 +2,4 @@
 --innodb-tablespaces-encryption
 --innodb-encryption-threads=2
 --innodb-default-encryption-key-id=4
--innodb-purge-rseg-truncate-frequency=1
 --skip-innodb-fast-shutdown