Merge branch '10.3' into 10.4

mysql-test/main/truncate.result

-drop table if exists t1, t2;
 create table t1 (a integer, b integer,c1 CHAR(10));
 insert into t1 (a) values (1),(2);
 truncate table t1;
@@ -158,26 +157,6 @@ TRUNCATE t1;
 HANDLER t1 READ FIRST;
 ERROR 42S02: Unknown table 't1' in HANDLER
 DROP TABLE t1;
-# End of 6.0 tests
 #
-# 10.2 Test
+# End of 5.5 tests
 #
-# MDEV-23365: Assertion `!is_set() || (m_status == DA_OK_BULK &&
-# is_bulk_op())' failed upon killed TRUNCATE
-#
-CREATE TABLE t1 (a INT) ENGINE=MyISAM;
-LOCK TABLE t1 READ;
-connect  con1,localhost,root,,test;
-SET SESSION max_session_mem_used= 65536;
-LOCK TABLE t1 WRITE;
-connection default;
-SELECT * FROM t1;
-a
-UNLOCK TABLES;
-connection con1;
-TRUNCATE TABLE t1;
-ERROR HY000: The MariaDB server is running with the --max-thread-mem-used=65536 option so it cannot execute this statement
-disconnect con1;
-connection default;
-DROP TABLE t1;
-# End of 10.2 Test

mysql-test/main/truncate.test

 #
 # Test of truncate
 #
---disable_warnings
-drop table if exists t1, t2;
---enable_warnings
 
 create table t1 (a integer, b integer,c1 CHAR(10));
 insert into t1 (a) values (1),(2);
@@ -161,34 +158,6 @@ HANDLER t1 READ FIRST;
 # Cleanup
 DROP TABLE t1;
 
---echo # End of 6.0 tests
-
---echo #
---echo # 10.2 Test
 --echo #
---echo # MDEV-23365: Assertion `!is_set() || (m_status == DA_OK_BULK &&
---echo # is_bulk_op())' failed upon killed TRUNCATE
+--echo # End of 5.5 tests
 --echo #
-
-CREATE TABLE t1 (a INT) ENGINE=MyISAM;
-LOCK TABLE t1 READ;
-
---connect (con1,localhost,root,,test)
-SET SESSION max_session_mem_used= 65536;
---send
-  LOCK TABLE t1 WRITE;
-
---connection default
-SELECT * FROM t1;
-UNLOCK TABLES;
-
---connection con1
---reap
---error ER_OPTION_PREVENTS_STATEMENT
-TRUNCATE TABLE t1;
-
---disconnect con1
---connection default
-DROP TABLE t1;
-
---echo # End of 10.2 Test

mysql-test/main/truncate_notembedded.result

+#
+# MDEV-23365: Assertion `!is_set() || (m_status == DA_OK_BULK &&
+# is_bulk_op())' failed upon killed TRUNCATE
+#
+CREATE TABLE t1 (a INT) ENGINE=MyISAM;
+LOCK TABLE t1 READ;
+connect  con1,localhost,root,,test;
+SET SESSION max_session_mem_used= 65536;
+LOCK TABLE t1 WRITE;
+connection default;
+SELECT * FROM t1;
+a
+UNLOCK TABLES;
+connection con1;
+TRUNCATE TABLE t1;
+ERROR HY000: The MariaDB server is running with the --max-thread-mem-used=65536 option so it cannot execute this statement
+disconnect con1;
+connection default;
+DROP TABLE t1;
+#
+# End of 10.2 tests
+#

mysql-test/main/truncate_notembedded.test

+--source include/not_embedded.inc
+
+--echo #
+--echo # MDEV-23365: Assertion `!is_set() || (m_status == DA_OK_BULK &&
+--echo # is_bulk_op())' failed upon killed TRUNCATE
+--echo #
+
+CREATE TABLE t1 (a INT) ENGINE=MyISAM;
+LOCK TABLE t1 READ;
+
+--connect (con1,localhost,root,,test)
+SET SESSION max_session_mem_used= 65536;
+--send
+  LOCK TABLE t1 WRITE;
+
+--connection default
+SELECT * FROM t1;
+UNLOCK TABLES;
+
+--connection con1
+--reap
+--error ER_OPTION_PREVENTS_STATEMENT
+TRUNCATE TABLE t1;
+
+--disconnect con1
+--connection default
+DROP TABLE t1;
+
+--echo #
+--echo # End of 10.2 tests
+--echo #