Merge 10.5 into 10.6

mysql-test/suite/innodb/t/alter_copy.test

@@ -2,8 +2,7 @@
 --source include/have_debug.inc
 --source include/have_debug_sync.inc
 --source include/not_embedded.inc
-# Valgrind gives leaks from the first shutdown which confuses mtr
-#--source include/not_valgrind.inc
+--source include/no_valgrind_without_big.inc
 
 --echo #
 --echo # MDEV-11415 AVOID INTERMEDIATE COMMIT WHILE DOING

mysql-test/suite/innodb/t/blob-crash.test

@@ -1,5 +1,6 @@
 --source include/maybe_debug.inc
 --source include/innodb_page_size_small.inc
+--source include/no_valgrind_without_big.inc
 
 --echo #
 --echo # Bug #16963396 INNODB: USE OF LARGE EXTERNALLY-STORED FIELDS MAKES

mysql-test/suite/innodb/t/instant_alter_import.test

@@ -208,3 +208,28 @@ UNLOCK TABLES;
 ALTER TABLE t2 IMPORT TABLESPACE;
 
 DROP TABLE t1, t2;
+
+--echo #
+--echo # MDEV-28919 Assertion `(((core_null) + 7) >> 3) ==
+--echo # oindex.n_core_null_bytes || !not_redundant()' failed
+--echo #
+call mtr.add_suppression(" InnoDB: Tablespace for table `test`.`t` is set as discarded");
+CREATE TABLE t (a INTEGER, b INTEGER as (a) VIRTUAL,
+                c INTEGER)engine=innodb;
+ALTER TABLE t DISCARD TABLESPACE;
+FLUSH TABLES;
+# Table does reload
+ALTER TABLE t DROP COLUMN b, algorithm=instant;
+ALTER TABLE t DROP COLUMN c, algorithm=instant;
+
+CREATE TABLE t1(a INTEGER)ENGINE=InnoDB;
+INSERT INTO t1 VALUES(1);
+FLUSH TABLE t1 FOR EXPORT;
+--let $MYSQLD_DATADIR= `select @@datadir`
+--move_file $MYSQLD_DATADIR/test/t1.cfg $MYSQLD_DATADIR/test/t.cfg
+--copy_file $MYSQLD_DATADIR/test/t1.ibd $MYSQLD_DATADIR/test/t.ibd
+unlock tables;
+ALTER TABLE t IMPORT tablespace;
+check table t;
+select * from t;
+DROP TABLE t, t1;

mysql-test/suite/innodb/t/log_file_name_debug.test

@@ -2,6 +2,7 @@
 # Embedded server does not support restarting
 --source include/not_embedded.inc
 --source include/have_debug.inc
+--source include/no_valgrind_without_big.inc
 
 --echo #
 --echo # Bug#19685095 DO NOT CARE ABOUT UNRESOLVED MLOG_FILE_NAME

mysql-test/suite/innodb/t/read_only_recover_committed.test

@@ -3,6 +3,7 @@
 --source include/have_debug_sync.inc
 # need to restart server
 --source include/not_embedded.inc
+--source include/no_valgrind_without_big.inc
 
 --disable_query_log
 # Ignore messages from the innodb_force_recovery=5 startup.

mysql-test/suite/innodb/t/table_flags.test

@@ -1,6 +1,7 @@
 --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
 
 --disable_query_log
 call mtr.add_suppression("InnoDB: Table `mysql`\\.`innodb_table_stats` not found");

mysql-test/suite/innodb/t/xa_recovery.test

@@ -1,6 +1,7 @@
 --source include/have_innodb.inc
 # Embedded server does not support restarting.
 --source include/not_embedded.inc
+--source include/no_valgrind_without_big.inc
 
 # MDEV-8841 - close tables opened by previous tests, 
 # so they don't get marked crashed when the server gets crashed