MDEV-28671 post-testing fixes

Various help message improvements:
* MySQL->MariaDB, mysqld->mariadbd, "mysqld daemon" -> "mariadbd process"
* typos
* don't specify defaults directly in the help message
* don't say that an option is deprecated, mark is as such
* missing spaces in the middle of the text
etc

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

@@ -20,7 +20,7 @@ The following specify which files/extra groups are read (specified before remain
  Percentage of rows from the table ANALYZE TABLE will
  sample to collect table statistics. Set to 0 to let
  MariaDB decide what percentage of rows to sample
- -a, --ansi          Use ANSI SQL syntax instead of MySQL syntax. This mode
+ -a, --ansi          Use ANSI SQL syntax instead of MariaDB syntax. This mode
  will also set transaction isolation level 'serializable'
  --auto-increment-increment[=#] 
  Auto-increment columns are incremented by this
@@ -34,7 +34,7 @@ The following specify which files/extra groups are read (specified before remain
  (Defaults to on; use --skip-automatic-sp-privileges to disable.)
  --back-log=#        The number of outstanding connection requests MariaDB can
  have. This comes into play when the main MariaDB thread
- gets very many connection requests in a very short time
+ gets many connection requests in a very short time
  (Automatically configured unless set explicitly)
  -b, --basedir=name  Path to installation directory. All paths are usually
  resolved relative to this
@@ -90,14 +90,11 @@ The following specify which files/extra groups are read (specified before remain
  --binlog-file-cache-size=# 
  The size of file cache for the binary log
  --binlog-format=name 
- What form of binary logging the master will use: either
- ROW for row-based binary logging, STATEMENT for
- statement-based binary logging, or MIXED. MIXED is
- statement-based binary logging except for those
- statements where only row-based is correct: those which
- involve user-defined functions (i.e. UDFs) or the UUID()
- function; for those, row-based binary logging is
- automatically used
+ The binary logging format the master will use: ROW for
+ row-based binary logging (safer), STATEMENT for
+ statement-based binary logging (smaller binary logs),
+ MIXED for statement-based binary logging when it's safe
+ with fall back to row-based otherwise
  --binlog-gtid-index Enable the creation of a GTID index for every binlog
  file, and the use of such index for speeding up GTID
  lookup in the binlog
@@ -138,18 +135,17 @@ The following specify which files/extra groups are read (specified before remain
  logged. 'FULL_NODUP', means that all columns are logged
  in before image, but only changed columns or all columns
  of inserted record are logged in after image, 'NOBLOB',
- means that mysqld avoids logging blob columns whenever
+ means that MariaDB avoids logging blob columns whenever
  possible (eg, blob column was not changed or is not part
  of primary key). 'MINIMAL', means that a PK equivalent
  (PK columns or full row if there is no PK in the table)
  is logged in the before image, and only changed columns
- are logged in the after image. (Default: FULL)
+ are logged in the after image
  --binlog-row-metadata=name 
  Controls whether metadata is logged using FULL , MINIMAL
- format and NO_LOG.FULL causes all metadata to be logged;
+ format and NO_LOG. FULL causes all metadata to be logged;
  MINIMAL means that only metadata actually required by
- slave is logged; NO_LOG NO metadata will be
- logged.Default: NO_LOG
+ slave is logged; NO_LOG NO metadata will be logged
  --binlog-space-limit=# 
  Alias for max_binlog_total_size. Compatibility with
  Percona server
@@ -163,10 +159,10 @@ The following specify which files/extra groups are read (specified before remain
  AES_DECRYPT() functions. One of: aes-128-ecb, aes-192-ecb,
  aes-256-ecb, aes-128-cbc, aes-192-cbc, aes-256-cbc, 
  aes-128-ctr, aes-192-ctr, aes-256-ctr
- --bootstrap         Used by mysql installation scripts
+ --bootstrap         Used by MariaDB installation scripts
  --bulk-insert-buffer-size=# 
- Size of tree cache used in bulk insert optimisation. Note
- that this is a limit per thread!
+ Size of tree cache used in bulk insert optimization. Note
+ that this is a limit per thread
  --character-set-client-handshake 
  Don't ignore client side character set value sent during
  handshake
@@ -179,7 +175,7 @@ The following specify which files/extra groups are read (specified before remain
  Set the default character set
  --character-sets-dir=name 
  Directory where character sets are
- -r, --chroot=name   Chroot mysqld daemon during startup
+ -r, --chroot=name   Chroot mariadbd process during startup
  --collation-server=name 
  Set the default collation
  --column-compression-threshold=# 
@@ -218,7 +214,7 @@ The following specify which files/extra groups are read (specified before remain
  Use concurrent insert with MyISAM. One of: NEVER, AUTO, 
  ALWAYS
  --console           Write error output on screen; don't remove the console
- window on windows
+ window on Windows
  --core-file         Write core on crashes
  -h, --datadir=name  Path to the database root directory
  --deadlock-search-depth-long=# 
@@ -318,7 +314,7 @@ The following specify which files/extra groups are read (specified before remain
  (Defaults to on; use --skip-explicit-defaults-for-timestamp to disable.)
  --external-locking  Use system (external) locking (disabled by default). 
  With this option enabled you can run myisamchk to test
- (not repair) tables while the MySQL server is running.
+ (not repair) tables while the MariaDB server is running.
  Disable with --skip-external-locking
  --extra-max-connections=# 
  The number of connections on extra-port
@@ -347,11 +343,11 @@ The following specify which files/extra groups are read (specified before remain
  --gdb               Set up signals usable for debugging. Deprecated, will be
  --general-log       Log connections and queries to a table or log file.
  Defaults logging to a file 'hostname'.log or a table
- mysql.general_logif --log-output=TABLE is used
+ mysql.general_log if --log-output=TABLE is used
  --general-log-file=name 
  Log connections and queries to given file
  --getopt-prefix-matching 
- Recognize command-line options by their unambiguos
+ Recognize command-line options by their unambiguous
  prefixes
  (Defaults to on; use --skip-getopt-prefix-matching to disable.)
  --group-concat-max-len=# 
@@ -449,9 +445,7 @@ The following specify which files/extra groups are read (specified before remain
  is specified. Deprecated, will be removed in a future
  release.
  --key-buffer-size=# The size of the buffer used for index blocks for MyISAM
- tables. Increase this to get better index handling (for
- all reads and multiple writes) to as much as you can
- afford
+ tables. Increase this to get faster index handling
  --key-cache-age-threshold=# 
  This characterizes the number of hits a hot block has to
  be untouched until it is considered aged enough to be
@@ -499,8 +493,8 @@ The following specify which files/extra groups are read (specified before remain
  stop if the real hostname of the computer changes
  --log-bin-compress  Whether the binary log can be compressed
  --log-bin-compress-min-len[=#] 
- Minimum length of sql statement(in statement mode) or
- record(in row mode)that can be compressed
+ Minimum length of sql statement (in statement mode) or
+ record (in row mode) that can be compressed
  --log-bin-index=name 
  File that holds the names for last binary log files
  --log-bin-trust-function-creators 
@@ -545,10 +539,10 @@ The following specify which files/extra groups are read (specified before remain
  combinations
  --log-slow-filter=name 
  Log only certain types of queries to the slow log. If
- 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, 
+ variable is empty all kinds 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, or ALL to set all combinations
@@ -589,8 +583,9 @@ The following specify which files/extra groups are read (specified before remain
  when binary log is disabled)
  --log-tc-size=#     Size of transaction coordinator log
  -W, --log-warnings[=#] 
- Log some non critical warnings to the error log.Value can
- be between 0 and 11. Higher values mean more verbosity
+ Log some non-critical warnings to the error log. Value
+ can be between 0 and 11. Higher values mean more
+ verbosity
  --long-query-time=# Alias for log_slow_query_time. Log all queries that have
  taken more than long_query_time seconds to execute to the
  slow query log file. The argument will be treated as a
@@ -681,11 +676,11 @@ The following specify which files/extra groups are read (specified before remain
  --max-write-lock-count=# 
  After this many write locks, allow some read locks to run
  in between
- --memlock           Lock mysqld in memory
+ --memlock           Lock mariadbd process in memory
  --metadata-locks-cache-size=# 
- Unused
+ Unused. Deprecated, will be removed in a future release.
  --metadata-locks-hash-instances=# 
- Unused
+ Unused. Deprecated, will be removed in a future release.
  --min-examined-row-limit=# 
  Alias for log_slow_min_examined_row_limit. Don't write
  queries to slow log that examine fewer rows than that
@@ -699,7 +694,7 @@ The following specify which files/extra groups are read (specified before remain
  the temporary file would get bigger than this
  --myisam-mmap-size=# 
  Restricts the total memory used for memory mapping of
- MySQL tables
+ MyISAM tables
  --myisam-recover-options[=name] 
  Specifies how corrupted tables should be automatically
  repaired. Any combination of: DEFAULT, BACKUP, FORCE, 
@@ -753,9 +748,9 @@ The following specify which files/extra groups are read (specified before remain
  resources were counted per each user+host vs. per
  account)
  --open-files-limit=# 
- If this is not 0, then mysqld will use this value to
+ If this is not 0, then mariadbd will use this value to
  reserve file descriptors to use with setrlimit(). If this
- value is 0 or autoset then mysqld will reserve
+ value is 0 or autoset then mariadbd will reserve
  max_connections*5 or max_connections + table_cache*2
  (whichever is larger) number of file descriptors
  (Automatically configured unless set explicitly)
@@ -775,7 +770,7 @@ The following specify which files/extra groups are read (specified before remain
  size or larger, then it will try aggressively prune away
  the search space
  --optimizer-index-block-copy-cost=# 
- Cost of copying a key block from the cache to intern
+ Cost of copying a key block from the cache to internal
  storage as part of an index scan
  --optimizer-key-compare-cost=# 
  Cost of checking a key against the end key condition
@@ -863,7 +858,7 @@ The following specify which files/extra groups are read (specified before remain
  any index to calculate the cardinality of a partial join,
  4 - use histograms to calculate selectivity of range
  conditions that are not backed by any index to calculate
- the cardinality of a partial join.5 - additionally use
+ the cardinality of a partial join. 5 - additionally use
  selectivity of certain non-range predicates calculated on
  record samples
  --optimizer-where-cost=# 
@@ -1030,7 +1025,7 @@ The following specify which files/extra groups are read (specified before remain
  --performance-schema-users-size=# 
  Maximum number of instrumented users. Use 0 to disable,
  -1 for automated sizing
- --pid-file=name     Pid file used by safe_mysqld
+ --pid-file=name     Pid file used by mariadbd-safe
  --plugin-dir=name   Directory for plugins
  --plugin-load=name  Semicolon-separated list of plugins to load, where each
  plugin is specified as ether a plugin_name=library_file
@@ -1067,9 +1062,9 @@ The following specify which files/extra groups are read (specified before remain
  syntax is a comma separated list of IPv4 and IPv6
  networks. If the network doesn't contain mask, it is
  considered to be a single host. "*" represents all
- networks and must the only directive on the line. String
- "localhost" represents non-TCP local connections (Unix
- domain socket, Windows named pipe or shared memory)
+ networks and must be the only directive on the line.
+ String "localhost" represents non-TCP local connections
+ (Unix domain socket, Windows named pipe or shared memory)
  --query-alloc-block-size=# 
  Allocation block size for query parsing and execution
  --query-cache-limit=# 
@@ -1243,7 +1238,7 @@ The following specify which files/extra groups are read (specified before remain
  Enable semi-synchronous replication slave (disabled by
  default)
  --rpl-semi-sync-slave-kill-conn-timeout[=#] 
- Timeout for the mysql connection used to kill the slave
+ Timeout for the MariaDB connection used to kill the slave
  io_thread's connection on master. This timeout comes into
  play when stop slave is executed
  --rpl-semi-sync-slave-trace-level=# 
@@ -1282,9 +1277,9 @@ The following specify which files/extra groups are read (specified before remain
  an active transaction? Does it have any data? etc.);
  CHARACTERISTICS to track transaction state and report all
  statements needed to start a transaction with the same
- characteristics (isolation level, read only/read
- write,snapshot - but not any work done / data modified
- within the transaction)
+ characteristics (isolation level, read only/read write,
+ snapshot - but not any work done / data modified within
+ the transaction)
  --show-slave-auth-info 
  Show user and password in SHOW SLAVE HOSTS on this master
  --silent-startup    Don't print [Note] to the error log during startup
@@ -1493,16 +1488,16 @@ The following specify which files/extra groups are read (specified before remain
  --tcp-keepalive-interval=# 
  The interval, in seconds, between when successive
  keep-alive packets are sent if no acknowledgement is
- received.If set to 0, system dependent default is used
+ received. If set to 0, system dependent default is used
  (Automatically configured unless set explicitly)
  --tcp-keepalive-probes=# 
  The number of unacknowledged probes to send before
  considering the connection dead and notifying the
- application layer.If set to 0, system dependent default
+ application layer. If set to 0, system dependent default
  is used (Automatically configured unless set explicitly)
  --tcp-keepalive-time=# 
  Timeout, in seconds, with no activity until the first TCP
- keep-alive packet is sent.If set to 0, system dependent
+ keep-alive packet is sent. If set to 0, system dependent
  default is used (Automatically configured unless set
  explicitly)
  --tcp-nodelay       Set option TCP_NODELAY (disable Nagle's algorithm) on
@@ -1517,8 +1512,8 @@ The following specify which files/extra groups are read (specified before remain
  If set to 1, provides better statistics in
  information_schema threadpool tables
  --thread-pool-idle-timeout=# 
- Timeout in seconds for an idle thread in the thread
- pool.Worker thread will be shut down after timeout
+ Timeout in seconds for an idle thread in the thread pool.
+ Worker thread will be shut down after timeout
  --thread-pool-max-threads=# 
  Maximum allowed number of worker threads in the thread
  pool
@@ -1530,8 +1525,8 @@ The following specify which files/extra groups are read (specified before remain
  statement is moved to the high-priority queue
  --thread-pool-priority=name 
  Threadpool priority. High priority connections usually
- start executing earlier than low priority.If priority set
- to 'auto', the the actual priority(low or high) is
+ start executing earlier than low priority. If priority
+ set to 'auto', the the actual priority(low or high) is
  determined based on whether or not connection is inside
  transaction
  --thread-pool-size=# 
@@ -1540,8 +1535,8 @@ The following specify which files/extra groups are read (specified before remain
  executing threads (threads in a waiting state do not
  count as executing)
  --thread-pool-stall-limit=# 
- Maximum query execution time in milliseconds,before an
- executing non-yielding thread is considered stalled.If a
+ Maximum query execution time in milliseconds, before an
+ executing non-yielding thread is considered stalled. If a
  worker thread is stalled, additional worker thread may be
  created to handle remaining clients
  --thread-stack=#    The stack size for each thread
@@ -1586,7 +1581,7 @@ The following specify which files/extra groups are read (specified before remain
  Specifies how to use system statistics tables. One of: 
  NEVER, COMPLEMENTARY, PREFERABLY, 
  COMPLEMENTARY_FOR_QUERIES, PREFERABLY_FOR_QUERIES
- -u, --user=name     Run mysqld daemon as user
+ -u, --user=name     User to run mariadbd process as
  --userstat          Enables statistics gathering for USER_STATISTICS,
  CLIENT_STATISTICS, INDEX_STATISTICS and TABLE_STATISTICS
  tables in the INFORMATION_SCHEMA
@@ -2008,4 +2003,4 @@ verbose TRUE
 wait-timeout 28800
 
 To see what variables a running server is using, type
-'SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES' instead of 'mysqld --verbose --help' or 'mariadbd --verbose --help'.
+'SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES' instead of 'mariadbd --verbose --help'.