Merge 10.6 into 10.10

The MDEV-29693 conflict resolution is from Monty, as well as is
a bug fix where ANALYZE TABLE wrongly built histograms for
single-column PRIMARY KEY.
Also includes a fix for safe_malloc error reporting.

Other things:
- Copied main.log_slow from 10.4 to avoid mtr issue

Disabled test:
- spider/bugfix.mdev_27239 because we started to get
  +Error	1429 Unable to connect to foreign data source: localhost
  -Error	1158 Got an error reading communication packets
- main.delayed
  - Bug#54332 Deadlock with two connections doing LOCK TABLE+INSERT DELAYED
    This part is disabled for now as it fails randomly with different
    warnings/errors (no corruption).

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

@@ -214,6 +214,7 @@ The following specify which files/extra groups are read (specified before remain
  Default flags for the regex library. Any combination of: 
  DOTALL, DUPNAMES, EXTENDED, EXTENDED_MORE, EXTRA, 
  MULTILINE, UNGREEDY
+ Use 'ALL' to set all combinations.
  --default-storage-engine=name 
  The default storage engine for new tables
  --default-time-zone=name 
@@ -490,12 +491,14 @@ The following specify which files/extra groups are read (specified before remain
  --log-disabled-statements=name 
  Don't log certain types of statements to general log. Any
  combination of: slave, sp
+ Use 'ALL' to set all combinations.
  --log-error[=name]  Log errors to file (instead of stdout).  If file name is
  not specified then 'datadir'/'log-basename'.err or the
  'pid-file' path with extension .err is used
  --log-isam[=name]   Log all MyISAM changes to file.
  --log-output=name   How logs should be written. Any combination of: NONE, 
  FILE, TABLE
+ Use 'ALL' to set all combinations.
  --log-queries-not-using-indexes 
  Log queries that are executed without benefit of any
  index to the slow log if it is open. Same as
@@ -514,15 +517,20 @@ The following specify which files/extra groups are read (specified before remain
  --log-slow-disabled-statements=name 
  Don't log certain types of statements to slow log. Any
  combination of: admin, call, slave, sp
+ Use 'ALL' to set all combinations.
  --log-slow-filter=name 
  Log only certain types of queries to the slow log. If
- variable empty alll kind of queries are logged.  All
- types are bound by slow_query_time, except
- 'not_using_index' which is always logged if enabled. Any
- combination of: admin, filesort, filesort_on_disk, 
+ variable empty all kind of queries are logged.  All types
+ are bound by slow_query_time, except 'not_using_index'
+ which is always logged if enabled. Any combination of: 
+ admin, filesort, filesort_on_disk, 
  filesort_priority_queue, full_join, full_scan, 
  not_using_index, query_cache, query_cache_miss, tmp_table,
  tmp_table_on_disk
+ Use 'ALL' to set all combinations.
+ --log-slow-max-warnings=# 
+ Max numbers of warnings printed to slow query log per
+ statement
  --log-slow-rate-limit=# 
  Write to slow log every #th slow query. Set to 1 to log
  everything. Increase it to reduce the size of the slow or
@@ -534,7 +542,8 @@ The following specify which files/extra groups are read (specified before remain
  (Defaults to on; use --skip-log-slow-slave-statements to disable.)
  --log-slow-verbosity=name 
  Verbosity level for the slow log. Any combination of: 
- innodb, query_plan, explain, engine, full
+ innodb, query_plan, explain, engine, warnings, full
+ Use 'ALL' to set all combinations.
  --log-tc=name       Path to transaction coordinator log (used for
  transactions that affect more than one storage engine,
  when binary log is disabled).
@@ -652,6 +661,7 @@ The following specify which files/extra groups are read (specified before remain
  Specifies how corrupted tables should be automatically
  repaired. Any combination of: DEFAULT, BACKUP, FORCE, 
  QUICK, BACKUP_ALL, OFF
+ Use 'ALL' to set all combinations.
  --myisam-repair-threads=# 
  If larger than 1, when repairing a MyISAM table all
  indexes will be created in parallel, with one thread per
@@ -680,6 +690,11 @@ The following specify which files/extra groups are read (specified before remain
  --net-write-timeout=# 
  Number of seconds to wait for a block to be written to a
  connection before aborting the write
+ --note-verbosity=name 
+ Verbosity level for note-warnings given to the user. See
+ also @@sql_notes.. Any combination of: basic, 
+ unusable_keys, explain
+ Use 'ALL' to set all combinations.
  --old               Use compatible behavior from previous MariaDB version.
  See also --old-mode
  --old-alter-table[=name] 
@@ -691,6 +706,7 @@ The following specify which files/extra groups are read (specified before remain
  NO_DUP_KEY_WARNINGS_WITH_IGNORE, NO_PROGRESS_INFO, 
  ZERO_DATE_TIME_CAST, UTF8_IS_UTF8MB3, 
  IGNORE_INDEX_ONLY_FOR_JOIN, COMPAT_5_1_CHECKSUM
+ Use 'ALL' to set all combinations.
  --old-passwords     Use old password encryption method (needed for 4.0 and
  older clients)
  --old-style-user-limits 
@@ -711,6 +727,10 @@ The following specify which files/extra groups are read (specified before remain
  --optimizer-max-sel-arg-weight=# 
  The maximum weight of the SEL_ARG graph. Set to 0 for no
  limit
+ --optimizer-max-sel-args=# 
+ The maximum number of SEL_ARG objects created when
+ optimizing a range. If more objects would be needed, the
+ range will not be used by the optimizer.
  --optimizer-prune-level=# 
  Controls the heuristic(s) applied during query
  optimization to prune less-promising partial plans from
@@ -1301,6 +1321,7 @@ The following specify which files/extra groups are read (specified before remain
  variable is empty, no conversions are allowed and it is
  expected that the types match exactly. Any combination
  of: ALL_LOSSY, ALL_NON_LOSSY
+ Use 'ALL' to set all combinations.
  --slow-launch-time=# 
  If creating the thread takes longer than this value (in
  seconds), the Slow_launch_threads counter will be
@@ -1331,6 +1352,7 @@ The following specify which files/extra groups are read (specified before remain
  NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH, 
  EMPTY_STRING_IS_NULL, SIMULTANEOUS_ASSIGNMENT, 
  TIME_ROUND_FRACTIONAL
+ Use 'ALL' to set all combinations.
  --sql-safe-updates  If set to 1, UPDATEs and DELETEs need either a key in the
  WHERE clause, or a LIMIT clause, or else they will
  aborted. Prevents the common mistake of accidentally
@@ -1438,6 +1460,7 @@ The following specify which files/extra groups are read (specified before remain
  --time-format=name  The TIME format (ignored)
  --tls-version=name  TLS protocol version for secure connections.. Any
  combination of: TLSv1.0, TLSv1.1, TLSv1.2, TLSv1.3
+ Use 'ALL' to set all combinations.
  --tmp-disk-table-size=# 
  Max size for data for an internal temporary on-disk
  MyISAM or Aria table.
@@ -1619,6 +1642,7 @@ log-slave-updates FALSE
 log-slow-admin-statements TRUE
 log-slow-disabled-statements sp
 log-slow-filter admin,filesort,filesort_on_disk,filesort_priority_queue,full_join,full_scan,query_cache,query_cache_miss,tmp_table,tmp_table_on_disk
+log-slow-max-warnings 10
 log-slow-rate-limit 1
 log-slow-slave-statements TRUE
 log-slow-verbosity 
@@ -1673,6 +1697,7 @@ net-buffer-length 16384
 net-read-timeout 30
 net-retry-count 10
 net-write-timeout 60
+note-verbosity basic,explain
 old FALSE
 old-alter-table DEFAULT
 old-mode UTF8_IS_UTF8MB3
@@ -1680,6 +1705,7 @@ old-passwords FALSE
 old-style-user-limits FALSE
 optimizer-extra-pruning-depth 8
 optimizer-max-sel-arg-weight 32000
+optimizer-max-sel-args 16000
 optimizer-prune-level 2
 optimizer-search-depth 62
 optimizer-selectivity-sampling-limit 100