Merge 10.6 into 10.7

2025-08-08 11:22:35 +03:00 · 2022-10-13 10:05:29 +03:00
parent b6ebadaa66 1feccb505f
commit 588efca237
183 changed files with 4359 additions and 1077 deletions
--- a/mysql-test/suite/innodb/t/alter_large_dml.test
+++ b/mysql-test/suite/innodb/t/alter_large_dml.test
@@ -5,6 +5,8 @@
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 --source include/have_sequence.inc
+# This test often times out with MemorySanitizer.
+--source include/not_msan.inc

 CREATE TABLE t1(f1 char(200), f2 char(200), f3 char(200),
 		f4 char(200), f5 char(200), f6 char(200),
--- a/mysql-test/suite/innodb/t/alter_missing_tablespace.test
+++ b/mysql-test/suite/innodb/t/alter_missing_tablespace.test
@@ -1,5 +1,6 @@
 --source include/not_embedded.inc
 --source include/innodb_page_size.inc
+--source include/no_valgrind_without_big.inc

 --echo #
 --echo # Bug#13955083 ALLOW IN-PLACE DDL OPERATIONS ON MISSING
--- a/mysql-test/suite/innodb/t/autoinc_persist.test
+++ b/mysql-test/suite/innodb/t/autoinc_persist.test
@@ -1,6 +1,7 @@
 --source include/have_innodb.inc
 # Restarting is not supported when testing the embedded server.
 --source include/not_embedded.inc
+--source include/no_valgrind_without_big.inc

 --echo #
 --echo # MDEV-6076 Persistent AUTO_INCREMENT for InnoDB
--- a/mysql-test/suite/innodb/t/ibuf_not_empty.test
+++ b/mysql-test/suite/innodb/t/ibuf_not_empty.test
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc
 # innodb_change_buffering_debug option is debug only
 --source include/have_debug.inc
 # Embedded server tests do not support restarting
--- a/mysql-test/suite/innodb/t/innodb-64k.test
+++ b/mysql-test/suite/innodb/t/innodb-64k.test
@@ -641,9 +641,12 @@ drop table t2;
 DROP TABLE t1;

 --echo #
--echo # MDEV-19526 heap number overflow
+--echo # MDEV-19526/MDEV-29742 heap number overflow
 --echo #
 CREATE TABLE t1(a SMALLINT NOT NULL UNIQUE AUTO_INCREMENT, KEY(a))
 ENGINE=InnoDB;
 INSERT INTO t1 (a) SELECT seq FROM seq_1_to_8191;
+ALTER TABLE t1 FORCE, ALGORITHM=INPLACE;
 DROP TABLE t1;
+
+--echo # End of 10.3 tests
--- a/mysql-test/suite/innodb/t/innodb-get-fk.test
+++ b/mysql-test/suite/innodb/t/innodb-get-fk.test
@@ -2,6 +2,8 @@
 --source include/default_charset.inc
 # need to restart server
 --source include/not_embedded.inc
+--source include/no_valgrind_without_big.inc
+
 CREATE SCHEMA `repro`;

 CREATE TABLE `repro`.`crew` (
--- a/mysql-test/suite/innodb/t/innodb-index-online.test
+++ b/mysql-test/suite/innodb/t/innodb-index-online.test
@@ -2,6 +2,7 @@
 --source include/innodb_encrypt_log.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
+--source include/no_valgrind_without_big.inc

 let $innodb_metrics_select=
 SELECT name, count FROM INFORMATION_SCHEMA.INNODB_METRICS WHERE subsystem = 'ddl';
--- a/mysql-test/suite/innodb/t/innodb-stats-initialize-failure.test
+++ b/mysql-test/suite/innodb/t/innodb-stats-initialize-failure.test
@@ -1,5 +1,6 @@
 # MDEV-6424: Mariadb server crashes with assertion failure in file ha_innodb.cc
 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc

 # DEBUG_SYNC must be compiled in.
 --source include/have_debug_sync.inc
--- a/mysql-test/suite/innodb/t/innodb-stats-sample.test
+++ b/mysql-test/suite/innodb/t/innodb-stats-sample.test
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc
 #
 # Test that mysqld does not crash when running ANALYZE TABLE with
 # different values of the parameter innodb_stats_transient_sample_pages.
--- a/mysql-test/suite/innodb/t/innodb-trim.test
+++ b/mysql-test/suite/innodb/t/innodb-trim.test
@@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_innodb_punchhole.inc
+--source include/no_valgrind_without_big.inc

 --disable_query_log
 --disable_warnings
--- a/mysql-test/suite/innodb/t/innodb_bug30423.test
+++ b/mysql-test/suite/innodb/t/innodb_bug30423.test
@@ -1,4 +1,5 @@
 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc
 # Test for Bug #30423, InnoDBs treatment of NULL in index stats causes
 # bad "rows examined" estimates.
 # Implemented InnoDB system variable "innodb_stats_method" with
--- a/mysql-test/suite/innodb/t/innodb_bug53290.test
+++ b/mysql-test/suite/innodb/t/innodb_bug53290.test
@@ -1,4 +1,5 @@
 -- source include/have_innodb.inc
+-- source include/no_valgrind_without_big.inc

 create table bug53290 (x bigint) engine=innodb;

--- a/mysql-test/suite/innodb/t/log_corruption.test
+++ b/mysql-test/suite/innodb/t/log_corruption.test
@@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/have_innodb_16k.inc
+--source include/no_valgrind_without_big.inc

 --disable_query_log
 call mtr.add_suppression("InnoDB: Upgrade after a crash is not supported");
--- a/mysql-test/suite/innodb/t/log_file.test
+++ b/mysql-test/suite/innodb/t/log_file.test
@@ -3,6 +3,7 @@
 --echo # Bug#16418661 - CHANGING NAME IN FOR INNODB_DATA_FILE_PATH SHOULD NOT SUCCEED WITH LOG FILES

 --source include/have_innodb.inc
+--source include/no_valgrind_without_big.inc

 --disable_query_log
 call mtr.add_suppression("InnoDB: Could not create undo tablespace.*undo002");
--- a/mysql-test/suite/innodb/t/log_file_name.test
+++ b/mysql-test/suite/innodb/t/log_file_name.test
@@ -2,7 +2,7 @@
 # Test the detection of duplicate tablespaces.

 --source include/have_innodb.inc
--source include/not_valgrind.inc
+--source include/no_valgrind_without_big.inc

 # Embedded server does not support crashing
 --source include/not_embedded.inc
--- a/mysql-test/suite/innodb/t/missing_tablespaces.test
+++ b/mysql-test/suite/innodb/t/missing_tablespaces.test
@@ -4,6 +4,7 @@
 --source include/not_embedded.inc
 #Windows has trouble creating files/directories with long names
 --source include/not_windows.inc
+--source include/no_valgrind_without_big.inc

 --echo #
 --echo # Bug#19419026 WHEN A TABLESPACE IS NOT FOUND, DO NOT REPORT "TABLE NOT FOUND"
--- a/mysql-test/suite/innodb/t/purge_secondary.test
+++ b/mysql-test/suite/innodb/t/purge_secondary.test
@@ -139,4 +139,36 @@ WHERE LOWER(variable_name) LIKE 'INNODB_BUFFER_POOL_PAGES_FLUSHED';

 DROP TABLE t1;

+--echo #
+--echo # MDEV-29666 InnoDB fails to purge secondary index records
+--echo #            when indexed virtual columns exist
+--echo #
+
+CREATE TABLE t1 (a INT, b INT, a1 INT AS(a) VIRTUAL,
+INDEX(a1),INDEX(b)) ENGINE=InnoDB;
+INSERT INTO t1 SET a=1, b=1;
+
+UPDATE t1 SET a=2, b=3;
+let DATADIR=`select @@datadir`;
+let PAGE_SIZE=`select @@innodb_page_size`;
+
+source include/wait_all_purged.inc;
+FLUSH TABLE t1 FOR EXPORT;
+
+perl;
+my $ps = $ENV{PAGE_SIZE};
+my $file = "$ENV{DATADIR}/test/t1.ibd";
+open(FILE, "<", $file) or die "Unable to open $file\n";
+die "Unable to read $file\n" unless
+    sysread(FILE, $_, 6*$ps) == 6*$ps;
+close(FILE);
+print "page 4: N_RECS=0x", unpack("H*", substr($_, 4 * $ps + 54, 2)), "\n";
+print "page 5: N_RECS=0x", unpack("H*", substr($_, 5 * $ps + 54, 2)), "\n";
+EOF
+
+UNLOCK TABLES;
+DROP TABLE t1;
+
+--echo # End of 10.3 tests
+
 SET GLOBAL innodb_purge_rseg_truncate_frequency = @saved_frequency;
--- a/mysql-test/suite/innodb/t/read_only_recover_committed.test
+++ b/mysql-test/suite/innodb/t/read_only_recover_committed.test
@@ -1,6 +1,7 @@
 --source include/have_innodb.inc
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
+--source include/no_valgrind_without_big.inc
 # need to restart server
 --source include/not_embedded.inc
 --source include/no_valgrind_without_big.inc
--- a/mysql-test/suite/innodb/t/recovery_shutdown.test
+++ b/mysql-test/suite/innodb/t/recovery_shutdown.test
@@ -1,5 +1,6 @@
 --source include/have_innodb.inc
 --source include/not_embedded.inc
+--source include/no_valgrind_without_big.inc
 --source include/have_sequence.inc

 # Flush any open myisam tables from previous tests
--- a/mysql-test/suite/innodb/t/table_flags.test
+++ b/mysql-test/suite/innodb/t/table_flags.test
@@ -1,7 +1,12 @@
 --source include/innodb_page_size.inc
 # Embedded server tests do not support restarting
 --source include/not_embedded.inc
--source include/no_valgrind_without_big.inc
+# Slow shutdown may take more than 120 seconds under Valgrind,
+# causing the server to be (silently) killed.
+# Due to that, crash recovery could "heal" the damage that our
+# Perl code is inflicting, and the SELECT statements could succeed
+# instead of failing with ER_NO_SUCH_TABLE_IN_ENGINE.
+--source include/not_valgrind.inc

 --disable_query_log
 call mtr.add_suppression("InnoDB: Table `mysql`\\.`innodb_table_stats` not found");
--- a/mysql-test/suite/innodb/t/undo_truncate.test
+++ b/mysql-test/suite/innodb/t/undo_truncate.test
@@ -3,6 +3,7 @@
 --source include/have_undo_tablespaces.inc
 --source include/not_embedded.inc
 --source include/have_sequence.inc
+--source include/no_valgrind_without_big.inc

 --disable_query_log
 call mtr.add_suppression("InnoDB: Difficult to find free blocks in the buffer pool");