Merge 11.2 into 11.4

Author: spetrunia

client/mysql.cc

@@ -1823,7 +1823,8 @@ static struct my_option my_long_options[] =
    "if the output is suspended. Doesn't use history file.",
    &quick, &quick, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"quick-max-column-width", 0,
-   "Maximal field length limit in case of --qick", &quick_max_column_width,
+   "Maximum number of characters displayed in a column header"
+   " when using --quick", &quick_max_column_width,
    &quick_max_column_width, 0, GET_ULONG, REQUIRED_ARG, LONG_MAX, 0, ULONG_MAX,
    0, 1, 0},
   {"raw", 'r', "Write fields without conversion. Used with --batch.",

mysql-test/main/client.result

@@ -58,5 +58,5 @@ insert into t1 values ("01234", "0123456789", "01234567890123456789", "1");
 +-----------+------------+----------------------+------+
 drop table t1;
 #
-# End of 10.7 tests
+# End of 10.5 tests
 #

mysql-test/main/client.test

@@ -42,5 +42,5 @@ insert into t1 values ("01234", "0123456789", "01234567890123456789", "1");
 drop table t1;
 
 --echo #
---echo # End of 10.7 tests
+--echo # End of 10.5 tests
 --echo #

mysql-test/main/having_cond_pushdown.result

@@ -6293,4 +6293,14 @@ HAVING (SELECT MAX(b) FROM t1) = a AND a > b;
 a	b
 2	1
 DROP TABLE t1;
+#
+# MDEV-25084: Moving equality with constant right side
+#             from HAVING to WHERE
+# (fixed by the patch for MDEV-26402)
+#
+CREATE TABLE t1 (a CHAR(3)) CHARSET=sjis;
+INSERT INTO t1 VALUES ('foo'),('bar');
+SELECT LOAD_FILE('') AS f, a FROM t1 GROUP BY f, a HAVING f = a;
+f	a
+DROP TABLE t1;
 End of 10.5 tests

mysql-test/main/having_cond_pushdown.test

@@ -1738,4 +1738,16 @@ eval $q;
 
 DROP TABLE t1;
 
+
+--echo #
+--echo # MDEV-25084: Moving equality with constant right side
+--echo #             from HAVING to WHERE
+--echo # (fixed by the patch for MDEV-26402)
+--echo #
+
+CREATE TABLE t1 (a CHAR(3)) CHARSET=sjis;
+INSERT INTO t1 VALUES ('foo'),('bar');
+SELECT LOAD_FILE('') AS f, a FROM t1 GROUP BY f, a HAVING f = a;
+DROP TABLE t1;
+
 --echo End of 10.5 tests

mysql-test/main/mysqld--help.result

@@ -780,6 +780,15 @@ The following specify which files/extra groups are read (specified before remain
  --optimizer-index-block-copy-cost=# 
  Cost of copying a key block from the cache to intern
  storage as part of an index scan.
+ --optimizer-join-limit-pref-ratio=# 
+ For queries with JOIN and ORDER BY LIMIT : make the
+ optimizer consider a join order that allows to short-cut
+ execution after producing #LIMIT matches if that promises
+ N times speedup. (A conservative setting here would be is
+ a high value, like 100 so the short-cutting plan is used
+ if it promises a speedup of 100x or more). Short-cutting
+ plans are inherently risky so the default is 0 which
+ means do not consider this optimization
  --optimizer-key-compare-cost=# 
  Cost of checking a key against the end key condition.
  --optimizer-key-copy-cost=# 
@@ -1808,6 +1817,7 @@ optimizer-disk-read-cost 10.24
 optimizer-disk-read-ratio 0.02
 optimizer-extra-pruning-depth 8
 optimizer-index-block-copy-cost 0.0356
+optimizer-join-limit-pref-ratio 0
 optimizer-key-compare-cost 0.011361
 optimizer-key-copy-cost 0.015685
 optimizer-key-lookup-cost 0.435777