Merge 10.5 into 10.6

2 files changed, 26 insertions, 1 deletions

diff --git a/mysql-test/suite/maria/maria.result b/mysql-test/suite/maria/maria.result
index ad714f26fb6..3bcb80060f0 100644
--- a/mysql-test/suite/maria/maria.result
+++ b/mysql-test/suite/maria/maria.result
@@ -2893,3 +2893,17 @@ key(c, a), unique(b)
 partition by hash (b);
 replace into t1 values (1, 0, 0), (2, 0, 0), (0, 0, 0);
 drop table t1;
+#
+# MDEV-28269 Assertion `save_errno' in maria_write or ER_GET_ERRNO
+#
+connect  session1,localhost,root,,;
+SET big_tables= on;
+Warnings:
+Warning	1287	'@@big_tables' is deprecated and will be removed in a future release
+SET NAMES 'sjis';
+SELECT 'למטה' AS a UNION SELECT 'Wetter' AS a;
+a
+למט×?
+Wetter
+connection default;
+disconnect session1;
diff --git a/mysql-test/suite/maria/maria.test b/mysql-test/suite/maria/maria.test
index 8e617eebc62..119d005dc72 100644
--- a/mysql-test/suite/maria/maria.test
+++ b/mysql-test/suite/maria/maria.test
@@ -1437,7 +1437,7 @@ CREATE TABLE t1 (
 ) ENGINE=aria DEFAULT CHARSET=utf8 PACK_KEYS=0;
 let $MYSQLD_DATADIR= `select @@datadir`;
 --replace_result $MYSQLD_DATADIR MYSQLD_DATADIR
---exec $MARIA_CHK -d $MYSQLD_DATADIR/test/t1
+--exec $MARIA_CHK -d --ignore-control-file $MYSQLD_DATADIR/test/t1
 DROP TABLE t1;
 
 # Test warnings with transactional=1 with MyISAM
@@ -2112,3 +2112,14 @@ partition by hash (b);
 replace into t1 values (1, 0, 0), (2, 0, 0), (0, 0, 0);
 # cleanup
 drop table t1;
+
+--echo #
+--echo # MDEV-28269 Assertion `save_errno' in maria_write or ER_GET_ERRNO
+--echo #
+
+connect (session1,localhost,root,,);
+SET big_tables= on;
+SET NAMES 'sjis';
+SELECT 'למטה' AS a UNION SELECT 'Wetter' AS a;
+connection default;
+disconnect session1;