MDEV-8579 - Some sysvars in I_S are missing any meaningful help (comment) text

Follow-up to original patch: fixing test cases.

1 files changed, 32 insertions, 19 deletions

diff --git a/mysql-test/r/mysqld--help.result b/mysql-test/r/mysqld--help.result
index af96555645b..f9aa90ab0ab 100644
--- a/mysql-test/r/mysqld--help.result
+++ b/mysql-test/r/mysqld--help.result
@@ -1,4 +1,4 @@
-Windows bug: happens when a new line is exactly at the right offset
+Windows bug: happens when a new line is exactly at the right offset.
 The following options may be given as the first argument:
 --print-defaults Print the program argument list and exit.
 --no-defaults Don't read default options from any option file.
@@ -23,13 +23,15 @@ The following options may be given as the first argument:
  Creating and dropping stored procedures alters ACLs
  (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 MySQL thread
+ have. This comes into play when the main MariaDB thread
  gets very 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
- --big-tables        Allow big result sets by saving all temporary sets on
- file (Solves most 'table full' errors)
+ --big-tables        Old variable, which if set to 1, allows large result sets
+ by saving all temporary sets to disk, avoiding 'table
+ full' errors. No longer needed, as the server now handles
+ this automatically. sql_big_tables is a synonym.
  --bind-address=name IP address to bind to.
  --binlog-annotate-row-events 
  Tells the master to annotate RBR events with the
@@ -104,7 +106,7 @@ The following options may be given as the first argument:
  The size of the statement cache for updates to
  non-transactional engines for the binary log. If you
  often use statements updating a great number of rows, you
- can increase this to get more performance
+ can increase this to get more performance.
  --bootstrap         Used by mysql installation scripts.
  --bulk-insert-buffer-size=# 
  Size of tree cache used in bulk insert optimisation. Note
@@ -161,12 +163,21 @@ The following options may be given as the first argument:
  --default-week-format=# 
  The default week format used by WEEK() functions
  --delay-key-write[=name] 
- Type of DELAY_KEY_WRITE. One of: OFF, ON, ALL
+ Specifies how MyISAM tables handles CREATE TABLE
+ DELAY_KEY_WRITE. If set to ON, the default, any DELAY KEY
+ WRITEs are honored. The key buffer is then flushed only
+ when the table closes, speeding up writes. MyISAM tables
+ should be automatically checked upon startup in this
+ case, and --external locking should not be used, as it
+ can lead to index corruption. If set to OFF, DELAY KEY
+ WRITEs are ignored, while if set to ALL, all new opened
+ tables are treated as if created with DELAY KEY WRITEs
+ enabled.
  --delayed-insert-limit=# 
  After inserting delayed_insert_limit rows, the INSERT
  DELAYED handler will check if there are any SELECT
  statements pending. If so, it allows these to execute
- before continuing
+ before continuing.
  --delayed-insert-timeout=# 
  How long a INSERT DELAYED thread should wait for INSERT
  statements before terminating
@@ -231,7 +242,7 @@ The following options may be given as the first argument:
  --gdb               Set up signals usable for debugging. Deprecated, use
  --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_logif --log-output=TABLE is used.
  --general-log-file=name 
  Log connections and queries to given file
  --getopt-prefix-matching 
@@ -372,7 +383,7 @@ The following options may be given as the first argument:
  logs.
  --log-slave-updates Tells the slave to log the updates from the slave thread
  to the binary log. You will need to turn it on if you
- plan to daisy-chain the slaves
+ plan to daisy-chain the slaves.
  --log-slow-admin-statements 
  Log slow OPTIMIZE, ANALYZE, ALTER and other
  administrative statements to the slow log if it is open.
@@ -567,7 +578,7 @@ The following options may be given as the first argument:
  automatically pick a reasonable value; if set to 63, the
  optimizer will switch to the original find_best search.
  NOTE: The value 63 and its associated behaviour is
- deprecated
+ deprecated.
  --optimizer-selectivity-sampling-limit=# 
  Controls number of record samples to check condition
  selectivity
@@ -754,7 +765,9 @@ The following options may be given as the first argument:
  The size of the buffer that is allocated when preloading
  indexes
  --profiling-history-size=# 
- Limit of query profiling memory
+ Number of statements about which profiling information is
+ maintained. If set to 0, no profiles are stored. See SHOW
+ PROFILES.
  --progress-report-time=# 
  Seconds between sending progress reports to the client
  for time-consuming statements. Set to 0 to disable
@@ -792,21 +805,21 @@ The following options may be given as the first argument:
  --read-rnd-buffer-size=# 
  When reading rows in sorted order after a sort, the rows
  are read through this buffer to avoid a disk seeks
- --relay-log=name    The location and name to use for relay logs
+ --relay-log=name    The location and name to use for relay logs.
  --relay-log-index=name 
  The location and name to use for the file that keeps a
  list of the last relay logs
  --relay-log-info-file=name 
  The location and name of the file that remembers where
- the SQL replication thread is in the relay logs
+ the SQL replication thread is in the relay logs.
  --relay-log-purge   if disabled - do not purge relay logs. if enabled - purge
- them as soon as they are no more needed
+ them as soon as they are no more needed.
  (Defaults to on; use --skip-relay-log-purge to disable.)
  --relay-log-recovery 
  Enables automatic relay log recovery right after the
  database startup, which means that the IO Thread starts
  re-fetching from the master right after the last
- transaction processed
+ transaction processed.
  --relay-log-space-limit=# 
  Maximum space to use for all relay logs
  --replicate-annotate-row-events 
@@ -950,7 +963,7 @@ The following options may be given as the first argument:
  idempotent. For example, in row based replication
  attempts to delete rows that doesn't exist will be
  ignored. In STRICT mode, replication will stop on any
- unexpected difference between the master and the slave
+ unexpected difference between the master and the slave.
  --slave-load-tmpdir=name 
  The location where the slave should put its temporary
  files when replicating a LOAD DATA INFILE command
@@ -1016,7 +1029,7 @@ The following options may be given as the first argument:
  --slow-query-log    Log slow queries to a table or log file. Defaults logging
  to a file 'hostname'-slow.log or a table mysql.slow_log
  if --log-output=TABLE is used. Must be enabled to
- activate other slow log options
+ activate other slow log options.
  --slow-query-log-file=name 
  Log slow queries to given log file. Defaults logging to
  'hostname'-slow.log. Must be enabled to activate other
@@ -1099,8 +1112,8 @@ The following options may be given as the first argument:
  --timed-mutexes     Specify whether to time mutexes. Deprecated, has no
  effect.
  --tmp-table-size=#  If an internal in-memory temporary table exceeds this
- size, MySQL will automatically convert it to an on-disk
- MyISAM or Aria table
+ size, MariaDB will automatically convert it to an on-disk
+ MyISAM or Aria table.
  -t, --tmpdir=name   Path for temporary files. Several paths may be specified,
  separated by a colon (:), in this case they are used in a
  round-robin fashion