Merge branch '10.6' into 10.9

Author: sanja-byelkin

mysql-test/main/delayed.test

@@ -611,7 +611,6 @@ disconnect con1;
 --source include/wait_until_disconnected.inc
 connection default;
 drop tables tm, t1, t2;
---enable_view_protocol
 
 --echo #
 --echo # MDEV-9621 INSERT DELAYED fails on insert for tables with many columns
@@ -660,3 +659,4 @@ INSERT DELAYED INTO t1 VALUES (0);
 INSERT DELAYED INTO t1 VALUES (0);
 DROP TABLE t1;
 
+--enable_view_protocol

mysql-test/main/distinct.result

@@ -1180,5 +1180,16 @@ a
 1
 drop table t1,t2;
 #
+# MDEV-31743 Server crash in store_length, assertion failure in
+#            Type_handler_string_result::sort_length
+#
+create table t1 (a int, b longtext, c varchar(18));
+insert into t1 values (1, 'Aa123456', 'abc'), (2, 'Bb7897777', 'def'),
+(3, 'Cc01287', 'xyz'), (5, 'd12345', 'efg');
+select distinct if(sum(a), b, 0) from t1 group by value(c) with rollup;
+if(sum(a), b, 0)
+Aa123456
+drop table t1;
+#
 # end of 10.5 tests
 #

mysql-test/main/distinct.test

@@ -914,6 +914,18 @@ select distinct a from t1 where t1.a=1 and t1.a in (select a+0 from t2 where t2.
 select distinct a from t1 where t1.a=1 and t1.a in (select a+0 from t2 where t2.b in (1,2)) limit 0,1;
 drop table t1,t2;
 
+--echo #
+--echo # MDEV-31743 Server crash in store_length, assertion failure in
+--echo #            Type_handler_string_result::sort_length
+--echo #
+
+create table t1 (a int, b longtext, c varchar(18));
+insert into t1 values (1, 'Aa123456', 'abc'), (2, 'Bb7897777', 'def'),
+  (3, 'Cc01287', 'xyz'), (5, 'd12345', 'efg');
+
+select distinct if(sum(a), b, 0) from t1 group by value(c) with rollup;
+drop table t1;
+
 --echo #
 --echo # end of 10.5 tests
 --echo #