Merge tag '11.4' into 11.6

MariaDB 11.4.4 release

mysql-test/main/join_cache.test

@@ -4229,7 +4229,7 @@ explain format=json
 select *
 from t1 a, t3 b
 where
-  b.kp1=a.a and
+  b.kp1+1=a.a+1 and
   b.kp1 <= 10 and
   b.kp2 <= 10 and
   b.col1 +1 < 33333;