Merge branch '10.6' into 10.9

mysql-test/main/derived_cond_pushdown.test

@@ -1896,9 +1896,9 @@ DELIMITER ;$$
 CALL p1('a');
 DROP PROCEDURE p1;
 
-
+--disable_ps2_protocol
 SELECT a FROM (SELECT "aa" a) t WHERE REGEXP_INSTR(t.a, (SELECT MAX('aa') FROM DUAL LIMIT 1));
-
+--enable_ps2_protocol
 
 DELIMITER $$;
 CREATE OR REPLACE FUNCTION f1(a VARCHAR(10), b VARCHAR(10)) RETURNS INT
@@ -3998,7 +3998,7 @@ select
      (select a, sum(b) as s from t2 group by a) as dt,
      t3
    where dt.a=t1.a and t3.a < 3
-  )
+  ) as SUBQ
 from t1 limit 5;
 
 eval explain $q;