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
2025-07-29 05:21:33 +03:00 · 2024-05-03 19:19:03 +02:00
parent 53582238a3
commit 5296f908ed
14 changed files with 430 additions and 430 deletions
--- a/mysql-test/main/mysqld--help,win.rdiff
+++ b/mysql-test/main/mysqld--help,win.rdiff
@ -1,14 +1,14 @@
 --- a/mysql-test/main/mysqld--help.result
 +++ b/mysql-test/main/mysqld--help.result
-@@ -220,6 +220,7 @@
+@@ -216,6 +216,7 @@ The following specify which files/extra groups are read (specified before remain
  --console           Write error output on screen; don't remove the console
-  window on windows
+  window on Windows
  --core-file         Write core on crashes
 + (Defaults to on; use --skip-core-file to disable.)
  -h, --datadir=name  Path to the database root directory
  --deadlock-search-depth-long=# 
  Long search depth for the two-step deadlock detection
-@@ -722,6 +723,7 @@
+@@ -717,6 +718,7 @@ The following specify which files/extra groups are read (specified before remain
  Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME,
  DATETIME, TIMESTAMP columns
  (Defaults to on; use --skip-mysql56-temporal-format to disable.)
@ -16,18 +16,18 @@
  --net-buffer-length=# 
  Buffer length for TCP/IP and socket communication
  --net-read-timeout=# 
-@@ -1419,6 +1421,10 @@
+@@ -1414,6 +1416,10 @@ The following specify which files/extra groups are read (specified before remain
  Alias for log_slow_query_file. Log slow queries to given
  log file. Defaults logging to 'hostname'-slow.log. Must
  be enabled to activate other slow log options
 + --slow-start-timeout=# 
 + Maximum number of milliseconds that the service control
 + manager should wait before trying to kill the windows
-+ service during startup(Default: 15000)
+ service during startup
  --socket=name       Socket file to use for connection
  --sort-buffer-size=# 
  Each thread that needs to do a sort allocates a buffer of
-@@ -1443,6 +1449,7 @@
+@@ -1438,6 +1444,7 @@ The following specify which files/extra groups are read (specified before remain
  deleting or updating every row in a table
  --stack-trace       Print a symbolic stack trace on failure
  (Defaults to on; use --skip-stack-trace to disable.)
@ -35,7 +35,7 @@
  --standard-compliant-cte 
  Allow only CTEs compliant to SQL standard
  (Defaults to on; use --skip-standard-compliant-cte to disable.)
-@@ -1522,6 +1529,11 @@
+@@ -1517,6 +1524,11 @@ The following specify which files/extra groups are read (specified before remain
  --thread-pool-max-threads=# 
  Maximum allowed number of worker threads in the thread
  pool
@ -47,7 +47,7 @@
  --thread-pool-oversubscribe=# 
  How many additional active worker threads in a group are
  allowed
-@@ -1560,8 +1572,8 @@
+@@ -1555,8 +1567,8 @@ The following specify which files/extra groups are read (specified before remain
  automatically convert it to an on-disk MyISAM or Aria
  table
  -t, --tmpdir=name   Path for temporary files. Several paths may be specified,
@ -58,7 +58,7 @@
  --transaction-alloc-block-size=# 
  Allocation block size for transactions to be stored in
  binary log
-@@ -1788,6 +1800,7 @@
+@@ -1783,6 +1795,7 @@ myisam-sort-buffer-size 134216704
 myisam-stats-method NULLS_UNEQUAL
 myisam-use-mmap FALSE
 mysql56-temporal-format TRUE
@ -66,7 +66,7 @@
 net-buffer-length 16384
 net-read-timeout 30
 net-retry-count 10
-@@ -1962,6 +1975,7 @@
+@@ -1957,6 +1970,7 @@ slave-transaction-retry-interval 0
 slave-type-conversions 
 slow-launch-time 2
 slow-query-log FALSE
@ -74,7 +74,7 @@
 sort-buffer-size 2097152
 sql-mode STRICT_TRANS_TABLES,ERROR_FOR_DIVISION_BY_ZERO,NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
 sql-safe-updates FALSE
-@@ -1989,6 +2003,8 @@
+@@ -1984,6 +1998,8 @@ thread-pool-dedicated-listener FALSE
 thread-pool-exact-stats FALSE
 thread-pool-idle-timeout 60
 thread-pool-max-threads 65536
--- a/mysql-test/main/mysqld--help.result
+++ b/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
+ The binary logging format the master will use: ROW for
- ROW for row-based binary logging, STATEMENT for
+ row-based binary logging (safer), STATEMENT for
- statement-based binary logging, or MIXED. MIXED is
+ statement-based binary logging (smaller binary logs),
- statement-based binary logging except for those
+ MIXED for statement-based binary logging when it's safe
- statements where only row-based is correct: those which
+ with fall back to row-based otherwise
 involve user-defined functions (i.e. UDFs) or the UUID()
 function; for those, row-based binary logging is
 automatically used
 --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
+ slave is logged; NO_LOG NO metadata will be logged
 logged.Default: NO_LOG
 --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
+ Size of tree cache used in bulk insert optimization. Note
- that this is a limit per thread!
+ 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
+ tables. Increase this to get faster index handling
 all reads and multiple writes) to as much as you can
 afford
 --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
+ Minimum length of sql statement (in statement mode) or
- record(in row mode)that can be compressed
+ 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
+ variable is empty all kinds of queries are logged.  All
- are bound by slow_query_time, except 'not_using_index'
+ types are bound by slow_query_time, except
- which is always logged if enabled. Any combination of: 
+ 'not_using_index' which is always logged if enabled. Any
- admin, filesort, filesort_on_disk, 
+ 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
+ Log some non-critical warnings to the error log. Value
- be between 0 and 11. Higher values mean more verbosity
+ 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
+ networks and must be the only directive on the line.
- "localhost" represents non-TCP local connections (Unix
+ String "localhost" represents non-TCP local connections
- domain socket, Windows named pipe or shared memory)
+ (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
+ characteristics (isolation level, read only/read write,
- write,snapshot - but not any work done / data modified
+ snapshot - but not any work done / data modified within
- within the transaction)
+ 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
+ Timeout in seconds for an idle thread in the thread pool.
- pool.Worker thread will be shut down after timeout
+ 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
+ start executing earlier than low priority. If priority
- to 'auto', the the actual priority(low or high) is
+ 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
+ Maximum query execution time in milliseconds, before an
- executing non-yielding thread is considered stalled.If a
+ 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'.
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb,32bit.rdiff
@ -1,6 +1,6 @@
--- sysvars_innodb.result
+--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
-+++ sysvars_innodb.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
-@@ -47,7 +47,7 @@
+@@ -47,7 +47,7 @@ VARIABLE_NAME	INNODB_ADAPTIVE_HASH_INDEX_PARTS
 SESSION_VALUE	NULL
 DEFAULT_VALUE	8
 VARIABLE_SCOPE	GLOBAL
@ -9,7 +9,7 @@
 VARIABLE_COMMENT	Number of InnoDB Adaptive Hash Index Partitions (default 8)
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	512
-@@ -71,7 +71,7 @@
+@@ -71,7 +71,7 @@ VARIABLE_NAME	INNODB_AUTOINC_LOCK_MODE
 SESSION_VALUE	NULL
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
@ -18,7 +18,7 @@
 VARIABLE_COMMENT	The AUTOINC lock modes supported by InnoDB: 0 => Old style AUTOINC locking (for backward compatibility); 1 => New style AUTOINC locking; 2 => No AUTOINC locking (unsafe for SBR)
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2
-@@ -83,10 +83,10 @@
+@@ -83,10 +83,10 @@ VARIABLE_NAME	INNODB_BUFFER_POOL_CHUNK_SIZE
 SESSION_VALUE	NULL
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@ -31,7 +31,7 @@
 NUMERIC_BLOCK_SIZE	1048576
 ENUM_VALUE_LIST	NULL
 READ_ONLY	YES
-@@ -119,7 +119,7 @@
+@@ -119,7 +119,7 @@ VARIABLE_NAME	INNODB_BUFFER_POOL_DUMP_PCT
 SESSION_VALUE	NULL
 DEFAULT_VALUE	25
 VARIABLE_SCOPE	GLOBAL
@ -40,16 +40,16 @@
 VARIABLE_COMMENT	Dump only the hottest N% of each buffer pool, defaults to 25
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	100
-@@ -203,7 +203,7 @@
+@@ -203,7 +203,7 @@ VARIABLE_NAME	INNODB_BUF_DUMP_STATUS_FREQUENCY
 SESSION_VALUE	NULL
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	A number between [0, 100] that tells how oftern buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed)
+ VARIABLE_COMMENT	A number that tells how often buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed)
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	100
-@@ -275,7 +275,7 @@
+@@ -275,7 +275,7 @@ VARIABLE_NAME	INNODB_COMPRESSION_FAILURE_THRESHOLD_PCT
 SESSION_VALUE	NULL
 DEFAULT_VALUE	5
 VARIABLE_SCOPE	GLOBAL
@ -58,7 +58,7 @@
 VARIABLE_COMMENT	If the compression failure rate of a table is greater than this number more padding is added to the pages to reduce the failures. A value of zero implies no padding
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	100
-@@ -299,7 +299,7 @@
+@@ -299,7 +299,7 @@ VARIABLE_NAME	INNODB_COMPRESSION_PAD_PCT_MAX
 SESSION_VALUE	NULL
 DEFAULT_VALUE	50
 VARIABLE_SCOPE	GLOBAL
@ -67,7 +67,7 @@
 VARIABLE_COMMENT	Percentage of empty space on a data page that can be reserved to make the page compressible
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	75
-@@ -527,7 +527,7 @@
+@@ -527,7 +527,7 @@ VARIABLE_NAME	INNODB_FATAL_SEMAPHORE_WAIT_THRESHOLD
 SESSION_VALUE	NULL
 DEFAULT_VALUE	600
 VARIABLE_SCOPE	GLOBAL
@ -76,7 +76,7 @@
 VARIABLE_COMMENT	Maximum number of seconds that semaphore times out in InnoDB
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	4294967295
-@@ -575,7 +575,7 @@
+@@ -575,7 +575,7 @@ VARIABLE_NAME	INNODB_FLUSHING_AVG_LOOPS
 SESSION_VALUE	NULL
 DEFAULT_VALUE	30
 VARIABLE_SCOPE	GLOBAL
@ -85,7 +85,7 @@
 VARIABLE_COMMENT	Number of iterations over which the background flushing is averaged
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	1000
-@@ -599,7 +599,7 @@
+@@ -599,7 +599,7 @@ VARIABLE_NAME	INNODB_FLUSH_LOG_AT_TRX_COMMIT
 SESSION_VALUE	NULL
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
@ -94,7 +94,7 @@
 VARIABLE_COMMENT	Controls the durability/speed trade-off for commits. Set to 0 (write and flush redo log to disk only once per second), 1 (flush to disk at each commit), 2 (write to log at commit but flush to disk only once per second) or 3 (flush to disk at prepare and at commit, slower and usually redundant). 1 and 3 guarantees that after a crash, committed transactions will not be lost and will be consistent with the binlog and other transactional engines. 2 can get inconsistent and lose transactions if there is a power failure or kernel crash but not if mysqld crashes. 0 has no guarantees in case of crash. 0 and 2 can be faster than 1 or 3
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	3
-@@ -623,7 +623,7 @@
+@@ -623,7 +623,7 @@ VARIABLE_NAME	INNODB_FLUSH_NEIGHBORS
 SESSION_VALUE	NULL
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
@ -103,7 +103,7 @@
 VARIABLE_COMMENT	Set to 0 (don't flush neighbors from buffer pool), 1 (flush contiguous neighbors from buffer pool) or 2 (flush neighbors from buffer pool), when flushing a block
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2
-@@ -659,7 +659,7 @@
+@@ -659,7 +659,7 @@ VARIABLE_NAME	INNODB_FORCE_RECOVERY
 SESSION_VALUE	NULL
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@ -112,7 +112,7 @@
 VARIABLE_COMMENT	Helps to save your data in case the disk image of the database becomes corrupt. Value 5 can return bogus data, and 6 can permanently corrupt data
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	6
-@@ -683,10 +683,10 @@
+@@ -683,10 +683,10 @@ VARIABLE_NAME	INNODB_FT_CACHE_SIZE
 SESSION_VALUE	NULL
 DEFAULT_VALUE	8000000
 VARIABLE_SCOPE	GLOBAL
@ -125,7 +125,7 @@
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
-@@ -719,7 +719,7 @@
+@@ -719,7 +719,7 @@ VARIABLE_NAME	INNODB_FT_MAX_TOKEN_SIZE
 SESSION_VALUE	NULL
 DEFAULT_VALUE	84
 VARIABLE_SCOPE	GLOBAL
@ -134,7 +134,7 @@
 VARIABLE_COMMENT	InnoDB Fulltext search maximum token size in characters
 NUMERIC_MIN_VALUE	10
 NUMERIC_MAX_VALUE	84
-@@ -731,7 +731,7 @@
+@@ -731,7 +731,7 @@ VARIABLE_NAME	INNODB_FT_MIN_TOKEN_SIZE
 SESSION_VALUE	NULL
 DEFAULT_VALUE	3
 VARIABLE_SCOPE	GLOBAL
@ -143,7 +143,7 @@
 VARIABLE_COMMENT	InnoDB Fulltext search minimum token size in characters
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	16
-@@ -743,7 +743,7 @@
+@@ -743,7 +743,7 @@ VARIABLE_NAME	INNODB_FT_NUM_WORD_OPTIMIZE
 SESSION_VALUE	NULL
 DEFAULT_VALUE	2000
 VARIABLE_SCOPE	GLOBAL
@ -152,7 +152,7 @@
 VARIABLE_COMMENT	InnoDB Fulltext search number of words to optimize for each optimize table call
 NUMERIC_MIN_VALUE	1000
 NUMERIC_MAX_VALUE	10000
-@@ -755,10 +755,10 @@
+@@ -755,10 +755,10 @@ VARIABLE_NAME	INNODB_FT_RESULT_CACHE_LIMIT
 SESSION_VALUE	NULL
 DEFAULT_VALUE	2000000000
 VARIABLE_SCOPE	GLOBAL
@ -165,7 +165,7 @@
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
-@@ -779,7 +779,7 @@
+@@ -779,7 +779,7 @@ VARIABLE_NAME	INNODB_FT_SORT_PLL_DEGREE
 SESSION_VALUE	NULL
 DEFAULT_VALUE	2
 VARIABLE_SCOPE	GLOBAL
@ -174,7 +174,7 @@
 VARIABLE_COMMENT	InnoDB Fulltext search parallel sort degree, will round up to nearest power of 2 number
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	16
-@@ -791,10 +791,10 @@
+@@ -791,10 +791,10 @@ VARIABLE_NAME	INNODB_FT_TOTAL_CACHE_SIZE
 SESSION_VALUE	NULL
 DEFAULT_VALUE	640000000
 VARIABLE_SCOPE	GLOBAL
@ -187,7 +187,7 @@
 NUMERIC_BLOCK_SIZE	0
 ENUM_VALUE_LIST	NULL
 READ_ONLY	NO
-@@ -839,22 +839,22 @@
+@@ -839,22 +839,22 @@ VARIABLE_NAME	INNODB_IO_CAPACITY
 SESSION_VALUE	NULL
 DEFAULT_VALUE	200
 VARIABLE_SCOPE	GLOBAL
@ -300,7 +300,7 @@
 VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Deprecated parameter with no effect
+ VARIABLE_COMMENT	Unused
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	128
@@ -1259,7 +1259,7 @@
--- a/mysql-test/suite/sys_vars/r/sysvars_innodb.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_innodb.result
@ -204,7 +204,7 @@ SESSION_VALUE	NULL
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	A number between [0, 100] that tells how oftern buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed)
+VARIABLE_COMMENT	A number that tells how often buffer pool dump status in percentages should be printed. E.g. 10 means that buffer pool dump status is printed when every 10% of number of buffer pool pages are dumped. Default is 0 (only start and end status is printed)
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	100
 NUMERIC_BLOCK_SIZE	0
@ -504,7 +504,7 @@ SESSION_VALUE	NULL
 DEFAULT_VALUE	OFF
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Enrypt the temporary table data
+VARIABLE_COMMENT	Encrypt the temporary table data
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1185,10 +1185,10 @@ READ_ONLY	YES
 COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	INNODB_PREFIX_INDEX_CLUSTER_OPTIMIZATION
 SESSION_VALUE	NULL
-DEFAULT_VALUE	ON
+DEFAULT_VALUE	OFF
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Deprecated parameter with no effect
+VARIABLE_COMMENT	Unused
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1224,7 +1224,7 @@ SESSION_VALUE	NULL
 DEFAULT_VALUE	128
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Deprecated parameter with no effect
+VARIABLE_COMMENT	Unused
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	128
 NUMERIC_BLOCK_SIZE	0
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded,32bit.rdiff
@ -1,5 +1,5 @@
--- sysvars_server_embedded.result	2024-02-15 09:34:10.105925200 +0100
+--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
-+++ sysvars_server_embedded,32bit.result	2024-02-15 13:49:05.823558727 +0100
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@@ -44,7 +44,7 @@
 COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	ARIA_BLOCK_SIZE
@ -127,7 +127,7 @@
 VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	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
+ VARIABLE_COMMENT	The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets many connection requests in a very short time
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	65535
@@ -357,7 +357,7 @@
@ -193,7 +193,7 @@
 READ_ONLY	NO
@@ -527,7 +527,7 @@
 VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread!
+ VARIABLE_COMMENT	Size of tree cache used in bulk insert optimization. Note that this is a limit per thread
 NUMERIC_MIN_VALUE	0
 -NUMERIC_MAX_VALUE	18446744073709551615
 +NUMERIC_MAX_VALUE	4294967295
@ -206,7 +206,7 @@
 VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake'
+ VARIABLE_COMMENT	The number of seconds the MariaDB server is waiting for a connect packet before responding with 'Bad handshake'
 NUMERIC_MIN_VALUE	2
 NUMERIC_MAX_VALUE	31536000
@@ -754,7 +754,7 @@
@ -382,7 +382,7 @@
 NUMERIC_MAX_VALUE	8
@@ -1467,7 +1467,7 @@
 VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	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
+ VARIABLE_COMMENT	The size of the buffer used for index blocks for MyISAM tables. Increase this to get faster index handling
 NUMERIC_MIN_VALUE	0
 -NUMERIC_MAX_VALUE	18446744073709551615
 +NUMERIC_MAX_VALUE	4294967295
@ -431,7 +431,7 @@
 VARIABLE_SCOPE	SESSION
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Log some non critical warnings to the error log.Value can be between 0 and 11. Higher values mean more verbosity
+ VARIABLE_COMMENT	Log some non-critical warnings to the error log. Value can be between 0 and 11. Higher values mean more verbosity
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
@@ -1874,7 +1874,7 @@
@ -640,7 +640,7 @@
 NUMERIC_MAX_VALUE	7
@@ -2197,7 +2197,7 @@
 VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	Restricts the total memory used for memory mapping of MySQL tables
+ VARIABLE_COMMENT	Restricts the total memory used for memory mapping of MyISAM tables
 NUMERIC_MIN_VALUE	7
 -NUMERIC_MAX_VALUE	18446744073709551615
 +NUMERIC_MAX_VALUE	4294967295
@ -711,7 +711,7 @@
 VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
+ VARIABLE_COMMENT	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 mariadbd will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
@@ -2354,7 +2354,7 @@
@ -795,7 +795,7 @@
 VARIABLE_SCOPE	SESSION
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by 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 selectivity of certain non-range predicates calculated on record samples
+ VARIABLE_COMMENT	Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by 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 selectivity of certain non-range predicates calculated on record samples
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	5
@@ -2614,7 +2614,7 @@
--- a/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_embedded.result
@ -305,7 +305,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	BACK_LOG
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets many connection requests in a very short time
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	65535
 NUMERIC_BLOCK_SIZE	1
@ -425,7 +425,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	BINLOG_FORMAT
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	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
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -475,7 +475,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	BINLOG_ROW_IMAGE
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	Controls whether rows should be logged in 'FULL', 'FULL_NODUP', 'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all columns in the before and after image are 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 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)
+VARIABLE_COMMENT	Controls whether rows should be logged in 'FULL', 'FULL_NODUP', 'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all columns in the before and after image are 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 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
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -485,7 +485,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	BINLOG_ROW_METADATA
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	Controls whether metadata is logged using FULL , MINIMAL 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
+VARIABLE_COMMENT	Controls whether metadata is logged using FULL , MINIMAL 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
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -525,7 +525,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	BULK_INSERT_BUFFER_SIZE
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread!
+VARIABLE_COMMENT	Size of tree cache used in bulk insert optimization. Note that this is a limit per thread
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	18446744073709551615
 NUMERIC_BLOCK_SIZE	1
@ -725,7 +725,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	CONNECT_TIMEOUT
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake'
+VARIABLE_COMMENT	The number of seconds the MariaDB server is waiting for a connect packet before responding with 'Bad handshake'
 NUMERIC_MIN_VALUE	2
 NUMERIC_MAX_VALUE	31536000
 NUMERIC_BLOCK_SIZE	1
@ -1105,7 +1105,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	GENERAL_LOG
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	Log connections and queries to a table or log file. Defaults logging to a file 'hostname'.log or a table mysql.general_log if --log-output=TABLE is used
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1235,7 +1235,7 @@ COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	HAVE_SSL
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	If the server supports secure connections, will be set to YES, otherwise will be set to NO. If set to DISABLED, the server was compiled with TLS support, but was not started with TLS support (see the mysqld options). See also have_openssl
+VARIABLE_COMMENT	If the server supports secure connections, will be set to YES, otherwise will be set to NO. If set to DISABLED, the server was compiled with TLS support, but was not started with TLS support (see the mariadbd options). See also have_openssl
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1465,7 +1465,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	KEY_BUFFER_SIZE
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	The size of the buffer used for index blocks for MyISAM tables. Increase this to get faster index handling
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	18446744073709551615
 NUMERIC_BLOCK_SIZE	4096
@ -1525,7 +1525,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	LARGE_FILES_SUPPORT
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Whether mysqld was compiled with options for large file support
+VARIABLE_COMMENT	Whether mariadbd was compiled with options for large file support
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1615,7 +1615,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	LOCKED_IN_MEMORY
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Whether mysqld was locked in memory with --memlock
+VARIABLE_COMMENT	Whether mariadbd process was locked in memory with --memlock
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1655,7 +1655,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	LOG_BIN_COMPRESS_MIN_LEN
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	Minimum length of sql statement(in statement mode) or record(in row mode)that can be compressed
+VARIABLE_COMMENT	Minimum length of sql statement (in statement mode) or record (in row mode) that can be compressed
 NUMERIC_MIN_VALUE	10
 NUMERIC_MAX_VALUE	1024
 NUMERIC_BLOCK_SIZE	1
@ -1735,7 +1735,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	LOG_SLOW_FILTER
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	SET
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	Log only certain types of queries to the slow log. If 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
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1825,7 +1825,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	LOG_WARNINGS
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Log some non critical warnings to the error log.Value can be between 0 and 11. Higher values mean more verbosity
+VARIABLE_COMMENT	Log some non-critical warnings to the error log. Value can be between 0 and 11. Higher values mean more verbosity
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	1
@ -2195,7 +2195,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MYISAM_MMAP_SIZE
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Restricts the total memory used for memory mapping of MySQL tables
+VARIABLE_COMMENT	Restricts the total memory used for memory mapping of MyISAM tables
 NUMERIC_MIN_VALUE	7
 NUMERIC_MAX_VALUE	18446744073709551615
 NUMERIC_BLOCK_SIZE	1
@ -2345,7 +2345,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	OPEN_FILES_LIMIT
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
+VARIABLE_COMMENT	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 mariadbd will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	1
@ -2395,7 +2395,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	OPTIMIZER_INDEX_BLOCK_COPY_COST
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	DOUBLE
-VARIABLE_COMMENT	Cost of copying a key block from the cache to intern storage as part of an index scan
+VARIABLE_COMMENT	Cost of copying a key block from the cache to internal storage as part of an index scan
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000
 NUMERIC_BLOCK_SIZE	NULL
@ -2585,7 +2585,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	OPTIMIZER_USE_CONDITION_SELECTIVITY
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by 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 selectivity of certain non-range predicates calculated on record samples
+VARIABLE_COMMENT	Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by 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 selectivity of certain non-range predicates calculated on record samples
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	5
 NUMERIC_BLOCK_SIZE	1
@ -3025,7 +3025,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PID_FILE
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	Pid file used by safe_mysqld
+VARIABLE_COMMENT	Pid file used by mariadbd-safe
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -3115,7 +3115,7 @@ COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	PROXY_PROTOCOL_NETWORKS
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	Enable proxy protocol for these source networks. The 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)
+VARIABLE_COMMENT	Enable proxy protocol for these source networks. The 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 be the only directive on the line. String "localhost" represents non-TCP local connections (Unix domain socket, Windows named pipe or shared memory)
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -3825,7 +3825,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	TCP_KEEPALIVE_INTERVAL
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	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
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2147483
 NUMERIC_BLOCK_SIZE	1
@ -3835,7 +3835,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	TCP_KEEPALIVE_PROBES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT
-VARIABLE_COMMENT	The number of unacknowledged probes to send before considering the connection dead and notifying the application layer.If set to 0, system dependent default is used
+VARIABLE_COMMENT	The number of unacknowledged probes to send before considering the connection dead and notifying the application layer. If set to 0, system dependent default is used
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2147483
 NUMERIC_BLOCK_SIZE	1
@ -3845,7 +3845,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	TCP_KEEPALIVE_TIME
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT
-VARIABLE_COMMENT	Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent.If set to 0, system dependent default is used
+VARIABLE_COMMENT	Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent. If set to 0, system dependent default is used
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2147483
 NUMERIC_BLOCK_SIZE	1
@ -4005,7 +4005,7 @@ COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	TX_ISOLATION
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	Default transaction isolation level.This variable is deprecated and will be removed in a future release
+VARIABLE_COMMENT	Default transaction isolation level
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -4015,7 +4015,7 @@ COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	TX_READ_ONLY
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION.This variable is deprecated and will be removed in a future release
+VARIABLE_COMMENT	Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded,32bit.rdiff
--- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
@ -305,7 +305,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	BACK_LOG
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	The number of outstanding connection requests MariaDB can have. This comes into play when the main MariaDB thread gets many connection requests in a very short time
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	65535
 NUMERIC_BLOCK_SIZE	1
@ -445,7 +445,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	BINLOG_FORMAT
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	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
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -525,7 +525,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	BINLOG_ROW_IMAGE
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	Controls whether rows should be logged in 'FULL', 'FULL_NODUP', 'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all columns in the before and after image are 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 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)
+VARIABLE_COMMENT	Controls whether rows should be logged in 'FULL', 'FULL_NODUP', 'NOBLOB' or 'MINIMAL' formats. 'FULL', means that all columns in the before and after image are 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 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
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -535,7 +535,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	BINLOG_ROW_METADATA
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	Controls whether metadata is logged using FULL , MINIMAL 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
+VARIABLE_COMMENT	Controls whether metadata is logged using FULL , MINIMAL 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
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -575,7 +575,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	BULK_INSERT_BUFFER_SIZE
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Size of tree cache used in bulk insert optimisation. Note that this is a limit per thread!
+VARIABLE_COMMENT	Size of tree cache used in bulk insert optimization. Note that this is a limit per thread
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	18446744073709551615
 NUMERIC_BLOCK_SIZE	1
@ -775,7 +775,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	CONNECT_TIMEOUT
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	The number of seconds the mysqld server is waiting for a connect packet before responding with 'Bad handshake'
+VARIABLE_COMMENT	The number of seconds the MariaDB server is waiting for a connect packet before responding with 'Bad handshake'
 NUMERIC_MIN_VALUE	2
 NUMERIC_MAX_VALUE	31536000
 NUMERIC_BLOCK_SIZE	1
@ -1175,7 +1175,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	GENERAL_LOG
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	Log connections and queries to a table or log file. Defaults logging to a file 'hostname'.log or a table mysql.general_log if --log-output=TABLE is used
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1205,7 +1205,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	GTID_BINLOG_POS
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	Last GTID logged to the binary log, per replicationdomain
+VARIABLE_COMMENT	Last GTID logged to the binary log, per replication domain
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1265,7 +1265,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	GTID_POS_AUTO_ENGINES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	List of engines for which to automatically create a mysql.gtid_slave_pos_ENGINE table, if a transaction using that engine is replicated. This can be used to avoid introducing cross-engine transactions, if engines are used different from that used by table mysql.gtid_slave_pos
+VARIABLE_COMMENT	List of engines for which a dedicated mysql.gtid_slave_pos_ENGINE table is created automatically, if a transaction using that engine is replicated. This helps to avoid cross-engine transactions, as would be the case when user tables and mysql.gtid_slave_pos were created in different transactional engines
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1385,7 +1385,7 @@ COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	HAVE_SSL
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	If the server supports secure connections, will be set to YES, otherwise will be set to NO. If set to DISABLED, the server was compiled with TLS support, but was not started with TLS support (see the mysqld options). See also have_openssl
+VARIABLE_COMMENT	If the server supports secure connections, will be set to YES, otherwise will be set to NO. If set to DISABLED, the server was compiled with TLS support, but was not started with TLS support (see the mariadbd options). See also have_openssl
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1615,7 +1615,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	KEY_BUFFER_SIZE
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	The size of the buffer used for index blocks for MyISAM tables. Increase this to get faster index handling
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	18446744073709551615
 NUMERIC_BLOCK_SIZE	4096
@ -1675,7 +1675,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	LARGE_FILES_SUPPORT
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Whether mysqld was compiled with options for large file support
+VARIABLE_COMMENT	Whether mariadbd was compiled with options for large file support
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1775,7 +1775,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	LOCKED_IN_MEMORY
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Whether mysqld was locked in memory with --memlock
+VARIABLE_COMMENT	Whether mariadbd process was locked in memory with --memlock
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -1825,7 +1825,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	LOG_BIN_COMPRESS_MIN_LEN
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	Minimum length of sql statement(in statement mode) or record(in row mode)that can be compressed
+VARIABLE_COMMENT	Minimum length of sql statement (in statement mode) or record (in row mode) that can be compressed
 NUMERIC_MIN_VALUE	10
 NUMERIC_MAX_VALUE	1024
 NUMERIC_BLOCK_SIZE	1
@ -1925,7 +1925,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	LOG_SLOW_FILTER
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	SET
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	Log only certain types of queries to the slow log. If 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
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -2015,7 +2015,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	LOG_WARNINGS
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Log some non critical warnings to the error log.Value can be between 0 and 11. Higher values mean more verbosity
+VARIABLE_COMMENT	Log some non-critical warnings to the error log. Value can be between 0 and 11. Higher values mean more verbosity
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	1
@ -2405,7 +2405,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	MYISAM_MMAP_SIZE
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Restricts the total memory used for memory mapping of MySQL tables
+VARIABLE_COMMENT	Restricts the total memory used for memory mapping of MyISAM tables
 NUMERIC_MIN_VALUE	7
 NUMERIC_MAX_VALUE	18446744073709551615
 NUMERIC_BLOCK_SIZE	1
@ -2555,7 +2555,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	OPEN_FILES_LIMIT
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	If this is not 0, then mysqld will use this value to reserve file descriptors to use with setrlimit(). If this value is 0 or autoset then mysqld will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
+VARIABLE_COMMENT	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 mariadbd will reserve max_connections*5 or max_connections + table_cache*2 (whichever is larger) number of file descriptors
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	1
@ -2605,7 +2605,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	OPTIMIZER_INDEX_BLOCK_COPY_COST
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	DOUBLE
-VARIABLE_COMMENT	Cost of copying a key block from the cache to intern storage as part of an index scan
+VARIABLE_COMMENT	Cost of copying a key block from the cache to internal storage as part of an index scan
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000
 NUMERIC_BLOCK_SIZE	NULL
@ -2795,7 +2795,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	OPTIMIZER_USE_CONDITION_SELECTIVITY
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by 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 selectivity of certain non-range predicates calculated on record samples
+VARIABLE_COMMENT	Controls selectivity of which conditions the optimizer takes into account to calculate cardinality of a partial join when it searches for the best execution plan Meaning: 1 - use selectivity of index backed range conditions to calculate the cardinality of a partial join if the last joined table is accessed by full table scan or an index scan, 2 - use selectivity of index backed range conditions to calculate the cardinality of a partial join in any case, 3 - additionally always use selectivity of range conditions that are not backed by 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 selectivity of certain non-range predicates calculated on record samples
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	5
 NUMERIC_BLOCK_SIZE	1
@ -3235,7 +3235,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	PID_FILE
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	Pid file used by safe_mysqld
+VARIABLE_COMMENT	Pid file used by mariadbd-safe
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -3325,7 +3325,7 @@ COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	PROXY_PROTOCOL_NETWORKS
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	Enable proxy protocol for these source networks. The 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)
+VARIABLE_COMMENT	Enable proxy protocol for these source networks. The 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 be the only directive on the line. String "localhost" represents non-TCP local connections (Unix domain socket, Windows named pipe or shared memory)
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -3655,7 +3655,7 @@ COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	REPLICATE_REWRITE_DB
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	Tells the slave to replicate binlog events into a different database than their original target on the master.Example: replicate-rewrite-db=master_db_name->slave_db_name
+VARIABLE_COMMENT	Tells the slave to replicate binlog events into a different database than their original target on the master. Example: replicate-rewrite-db=master_db_name->slave_db_name
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -3815,7 +3815,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	RPL_SEMI_SYNC_SLAVE_KILL_CONN_TIMEOUT
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	Timeout for the mysql connection used to kill the slave io_thread's connection on master. This timeout comes into play when stop slave is executed
+VARIABLE_COMMENT	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
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	1
@ -3905,7 +3905,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	SESSION_TRACK_TRANSACTION_INFO
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	Track changes to the transaction attributes. OFF to disable; STATE to track just transaction state (Is there 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)
+VARIABLE_COMMENT	Track changes to the transaction attributes. OFF to disable; STATE to track just transaction state (Is there 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)
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -4595,7 +4595,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	TCP_KEEPALIVE_INTERVAL
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	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
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2147483
 NUMERIC_BLOCK_SIZE	1
@ -4605,7 +4605,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	TCP_KEEPALIVE_PROBES
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT
-VARIABLE_COMMENT	The number of unacknowledged probes to send before considering the connection dead and notifying the application layer.If set to 0, system dependent default is used
+VARIABLE_COMMENT	The number of unacknowledged probes to send before considering the connection dead and notifying the application layer. If set to 0, system dependent default is used
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2147483
 NUMERIC_BLOCK_SIZE	1
@ -4615,7 +4615,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	TCP_KEEPALIVE_TIME
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT
-VARIABLE_COMMENT	Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent.If set to 0, system dependent default is used
+VARIABLE_COMMENT	Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent. If set to 0, system dependent default is used
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	2147483
 NUMERIC_BLOCK_SIZE	1
@ -4675,7 +4675,7 @@ COMMAND_LINE_ARGUMENT	OPTIONAL
 VARIABLE_NAME	THREAD_POOL_IDLE_TIMEOUT
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	Timeout in seconds for an idle thread in the thread pool.Worker thread will be shut down after timeout
+VARIABLE_COMMENT	Timeout in seconds for an idle thread in the thread pool. Worker thread will be shut down after timeout
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	1
@ -4705,7 +4705,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	THREAD_POOL_PRIORITY
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	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 determined based on whether or not connection is inside transaction
+VARIABLE_COMMENT	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 determined based on whether or not connection is inside transaction
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -4735,7 +4735,7 @@ COMMAND_LINE_ARGUMENT	REQUIRED
 VARIABLE_NAME	THREAD_POOL_STALL_LIMIT
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	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
+VARIABLE_COMMENT	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
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	1
@ -4865,7 +4865,7 @@ COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	TX_ISOLATION
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	ENUM
-VARIABLE_COMMENT	Default transaction isolation level.This variable is deprecated and will be removed in a future release
+VARIABLE_COMMENT	Default transaction isolation level
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
@ -4875,7 +4875,7 @@ COMMAND_LINE_ARGUMENT	NULL
 VARIABLE_NAME	TX_READ_ONLY
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BOOLEAN
-VARIABLE_COMMENT	Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION.This variable is deprecated and will be removed in a future release
+VARIABLE_COMMENT	Default transaction access mode. If set to OFF, the default, access is read/write. If set to ON, access is read-only. The SET TRANSACTION statement can also change the value of this variable. See SET TRANSACTION and START TRANSACTION
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL
--- a/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff
+++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff
@ -1,6 +1,6 @@
 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
 +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
-@@ -292,7 +292,7 @@
+@@ -292,7 +292,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
@ -9,7 +9,7 @@
 VARIABLE_COMMENT	Max number of rows in write set
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1048576
-@@ -307,7 +307,7 @@
+@@ -307,7 +307,7 @@ GLOBAL_VALUE	2147483647
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	2147483647
 VARIABLE_SCOPE	GLOBAL
@ -18,16 +18,16 @@
 VARIABLE_COMMENT	Max write set size (bytes)
 NUMERIC_MIN_VALUE	1024
 NUMERIC_MAX_VALUE	2147483647
-@@ -337,7 +337,7 @@
+@@ -337,7 +337,7 @@ GLOBAL_VALUE	0
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	mysql replication group commit
+ VARIABLE_COMMENT	Number of replication events that are grouped together
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000
-@@ -532,7 +532,7 @@
+@@ -532,7 +532,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
@ -36,7 +36,7 @@
 VARIABLE_COMMENT	Max number of times to retry a failed autocommit statement
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	10000
-@@ -562,7 +562,7 @@
+@@ -562,7 +562,7 @@ GLOBAL_VALUE	1
 GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
--- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
+++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
@ -338,7 +338,7 @@ GLOBAL_VALUE_ORIGIN	COMPILE-TIME
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	mysql replication group commit
+VARIABLE_COMMENT	Number of replication events that are grouped together
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000
 NUMERIC_BLOCK_SIZE	1
--- a/sql/mysqld.cc
+++ b/sql/mysqld.cc
@ -892,7 +892,7 @@ static struct my_option pfs_early_options[]=
    GET_BOOL, OPT_ARG, TRUE, 0, 0, 0, 0, 0},
 #endif /* WITH_PERFSCHEMA_STORAGE_ENGINE */
  {"getopt-prefix-matching", 0,
-    "Recognize command-line options by their unambiguos prefixes",
+    "Recognize command-line options by their unambiguous prefixes",
    &my_getopt_prefix_matching, &my_getopt_prefix_matching, 0, GET_BOOL,
    NO_ARG, 1, 0, 1, 0, 0, 0}
 };
@ -6451,7 +6451,7 @@ struct my_option my_long_options[]=
  {"help", '?', "Display this help and exit", 
   &opt_help, &opt_help, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0,
   0, 0},
-  {"ansi", 'a', "Use ANSI SQL syntax instead of MySQL syntax. This mode "
+  {"ansi", 'a', "Use ANSI SQL syntax instead of MariaDB syntax. This mode "
   "will also set transaction isolation level 'serializable'", 0, 0, 0,
   GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
  /*
@ -6469,7 +6469,7 @@ struct my_option my_long_options[]=
   "Tells the master that updates to the given database should not be logged to the binary log",
   0, 0, 0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #ifndef DISABLE_GRANT_OPTIONS
-  {"bootstrap", OPT_BOOTSTRAP, "Used by mysql installation scripts", 0, 0, 0,
+  {"bootstrap", OPT_BOOTSTRAP, "Used by MariaDB installation scripts", 0, 0, 0,
   GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
 #endif
  {"character-set-client-handshake", 0,
@ -6485,7 +6485,7 @@ struct my_option my_long_options[]=
  {"character-set-server", 'C', "Set the default character set",
   &default_character_set_name, &default_character_set_name,
   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
-  {"chroot", 'r', "Chroot mysqld daemon during startup",
+  {"chroot", 'r', "Chroot mariadbd process during startup",
   &mysqld_chroot, &mysqld_chroot, 0, GET_STR, REQUIRED_ARG,
   0, 0, 0, 0, 0, 0},
  {"collation-server", 0, "Set the default collation",
@ -6494,7 +6494,7 @@ struct my_option my_long_options[]=
  {"character-set-collations", 0, "Overrides for character set default collations",
   &character_set_collations_str, &character_set_collations_str,
   0, GET_STR, REQUIRED_ARG, 0, 0, 0, 0, 0, 0 },
-  {"console", OPT_CONSOLE, "Write error output on screen; don't remove the console window on windows",
+  {"console", OPT_CONSOLE, "Write error output on screen; don't remove the console window on Windows",
   &opt_console, &opt_console, 0, GET_BOOL, NO_ARG, 0, 0, 0,
   0, 0, 0},
 #ifdef DBUG_OFF
@ -6541,7 +6541,7 @@ struct my_option my_long_options[]=
   GET_INT, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif /* HAVE_REPLICATION */
  {"debug-no-sync", 0,
-   "Disables system sync calls. Only for running tests or debugging!",
+   "Disables system sync calls. Only for running tests or debugging",
   &my_disable_sync, &my_disable_sync, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
 #ifdef HAVE_REPLICATION
  {"debug-sporadic-binlog-dump-fail", 0,
@ -6593,7 +6593,7 @@ struct my_option my_long_options[]=
   0, 0, 0, 0, 0, 0 },
  {"external-locking", 0, "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. Disable with "
+   "(not repair) tables while the MariaDB server is running. Disable with "
   "--skip-external-locking", &opt_external_locking, &opt_external_locking,
   0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
  /* We must always support the next option to make scripts like mysqltest
@ -6687,7 +6687,7 @@ struct my_option my_long_options[]=
   &rpl_status, &rpl_status, &rpl_role_typelib,
   GET_ENUM, REQUIRED_ARG, 0, 0, 0, 0, 0, 0},
 #endif /* HAVE_REPLICATION */
-  {"memlock", 0, "Lock mysqld in memory", &locked_in_memory,
+  {"memlock", 0, "Lock mariadbd process in memory", &locked_in_memory,
   &locked_in_memory, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
  {"old-style-user-limits", 0,
   "Enable old-style user limits (before 5.0.3, user resources were counted "
@ -6786,8 +6786,8 @@ struct my_option my_long_options[]=
 #if defined(_WIN32) && !defined(EMBEDDED_LIBRARY)
  {"slow-start-timeout", 0,
   "Maximum number of milliseconds that the service control manager should wait "
-   "before trying to kill the windows service during startup"
+   "before trying to kill the windows service during startup",
-   "(Default: 15000)", &slow_start_timeout, &slow_start_timeout, 0,
+   &slow_start_timeout, &slow_start_timeout, 0,
   GET_ULONG, REQUIRED_ARG, 15000, 0, 0, 0, 0, 0},
 #endif
 #ifdef HAVE_OPENSSL
@ -6824,12 +6824,12 @@ struct my_option my_long_options[]=
  {"temp-pool", 0,
 #if (ENABLE_TEMP_POOL)
   "Using this option will cause most temporary files created to use a small "
-   "set of names, rather than a unique name for each new file. Deprecated",
+   "set of names, rather than a unique name for each new file",
 #else
   "This option is ignored on this OS",
 #endif
   &use_temp_pool, &use_temp_pool, 0, GET_BOOL, NO_ARG, 0,
-   0, 0, 0, 0, 0},
+   0, 0, "", 0, 0},
  {"transaction-isolation", 0,
   "Default transaction isolation level",
   &global_system_variables.tx_isolation,
@ -6841,7 +6841,7 @@ struct my_option my_long_options[]=
   &global_system_variables.tx_read_only,
   &global_system_variables.tx_read_only, 0,
   GET_BOOL, OPT_ARG, 0, 0, 0, 0, 0, 0},
-  {"user", 'u', "Run mysqld daemon as user", 0, 0, 0, GET_STR, REQUIRED_ARG,
+  {"user", 'u', "User to run mariadbd process as", 0, 0, 0, GET_STR, REQUIRED_ARG,
   0, 0, 0, 0, 0, 0},
  {"verbose", 'v', "Used with --help option for detailed help",
   &opt_verbose, &opt_verbose, 0, GET_BOOL, NO_ARG, 0, 0, 0, 0, 0, 0},
@ -7748,7 +7748,7 @@ static void usage(void)
  puts("Starts the MariaDB database server.\n");
  printf("Usage: %s [OPTIONS]\n", my_progname);
  if (!opt_verbose)
-    puts("\nFor more help options (several pages), use mysqld --verbose --help.");
+    puts("\nFor more help options (several pages), use mariadbd --verbose --help.");
  else
  {
 #ifdef _WIN32
@ -7777,7 +7777,8 @@ static void usage(void)
  }
    puts("\nTo see what variables a running server is using, type"
-         "\n'SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES' instead of 'mysqld --verbose --help' or 'mariadbd --verbose --help'.");
+         "\n'SELECT * FROM INFORMATION_SCHEMA.GLOBAL_VARIABLES' instead "
         "of 'mariadbd --verbose --help'.");
  }
  DBUG_VOID_RETURN;
 }
--- a/sql/sys_vars.cc
+++ b/sql/sys_vars.cc
@ -510,7 +510,7 @@ static Sys_var_mybool Sys_automatic_sp_privileges(
 static Sys_var_ulong Sys_back_log(
       "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",
       AUTO_SET READ_ONLY GLOBAL_VAR(back_log), CMD_LINE(REQUIRED_ARG),
       VALID_RANGE(0, 65535), DEFAULT(150), BLOCK_SIZE(1));
@ -693,13 +693,11 @@ static Sys_var_on_access<Sys_var_enum,
                         PRIV_SET_SYSTEM_VAR_BINLOG_FORMAT,
                         PRIV_SET_SYSTEM_VAR_BINLOG_FORMAT>
 Sys_binlog_format(
-       "binlog_format", "What form of binary logging the master will "
+       "binlog_format", "The binary logging format the master will "
-       "use: either ROW for row-based binary logging, STATEMENT "
+       "use: ROW for row-based binary logging (safer), STATEMENT "
-       "for statement-based binary logging, or MIXED. MIXED is statement-"
+       "for statement-based binary logging (smaller binary logs), MIXED "
-       "based binary logging except for those statements where only row-"
+       "for statement-based binary logging when it's safe with fall back "
-       "based is correct: those which involve user-defined functions (i.e. "
+       "to row-based otherwise",
       "UDFs) or the UUID() function; for those, row-based binary logging is "
       "automatically used",
       SESSION_VAR(binlog_format), CMD_LINE(REQUIRED_ARG, OPT_BINLOG_FORMAT),
       binlog_format_names, DEFAULT(BINLOG_FORMAT_MIXED),
       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(binlog_format_check),
@ -750,7 +748,7 @@ static Sys_var_bit Sys_explicit_defaults_for_timestamp(
 static Sys_var_ulonglong Sys_bulk_insert_buff_size(
       "bulk_insert_buffer_size", "Size of tree cache used in bulk "
-       "insert optimisation. Note that this is a limit per thread!",
+       "insert optimization. Note that this is a limit per thread",
       SESSION_VAR(bulk_insert_buff_size), CMD_LINE(REQUIRED_ARG),
       VALID_RANGE(0, SIZE_T_MAX), DEFAULT(8192*1024), BLOCK_SIZE(1));
@ -1042,7 +1040,7 @@ static Sys_var_on_access_global<Sys_var_ulong,
                                PRIV_SET_SYSTEM_GLOBAL_VAR_CONNECT_TIMEOUT>
 Sys_connect_timeout(
       "connect_timeout",
-       "The number of seconds the mysqld server is waiting for a connect "
+       "The number of seconds the MariaDB server is waiting for a connect "
       "packet before responding with 'Bad handshake'",
       GLOBAL_VAR(connect_timeout), CMD_LINE(REQUIRED_ARG),
       VALID_RANGE(2, LONG_TIMEOUT), DEFAULT(CONNECT_TIMEOUT), BLOCK_SIZE(1));
@ -1457,9 +1455,8 @@ static Sys_var_ulonglong Sys_join_buffer_size(
 static Sys_var_keycache Sys_key_buffer_size(
       "key_buffer_size", "The size of the buffer used for "
-       "index blocks for MyISAM tables. Increase this to get better index "
+       "index blocks for MyISAM tables. Increase this to get faster index "
-       "handling (for all reads and multiple writes) to as much as you can "
+       "handling",
       "afford",
       KEYCACHE_VAR(param_buff_size),
       CMD_LINE(REQUIRED_ARG, OPT_KEY_BUFFER_SIZE),
       VALID_RANGE(0, SIZE_T_MAX), DEFAULT(KEY_CACHE_SIZE),
@ -1508,7 +1505,7 @@ static Sys_var_keycache Sys_key_cache_file_hash_size(
 static Sys_var_mybool Sys_large_files_support(
       "large_files_support",
-       "Whether mysqld was compiled with options for large file support",
+       "Whether mariadbd was compiled with options for large file support",
       READ_ONLY GLOBAL_VAR(opt_large_files),
       CMD_LINE_HELP_ONLY, DEFAULT(sizeof(my_off_t) > 4));
@ -1544,7 +1541,7 @@ static Sys_var_ulong Sys_lock_wait_timeout(
 #ifdef HAVE_MLOCKALL
 static Sys_var_mybool Sys_locked_in_memory(
       "locked_in_memory",
-       "Whether mysqld was locked in memory with --memlock",
+       "Whether mariadbd process was locked in memory with --memlock",
       READ_ONLY GLOBAL_VAR(locked_in_memory), NO_CMD_LINE, DEFAULT(FALSE));
 #endif
@ -1564,7 +1561,7 @@ static Sys_var_on_access_global<Sys_var_uint,
                            PRIV_SET_SYSTEM_GLOBAL_VAR_LOG_BIN_COMPRESS_MIN_LEN>
 Sys_log_bin_compress_min_len(
  "log_bin_compress_min_len",
-  "Minimum length of sql statement(in statement mode) or record(in row mode)"
+  "Minimum length of sql statement (in statement mode) or record (in row mode) "
  "that can be compressed",
  GLOBAL_VAR(opt_bin_log_compress_min_len),
  CMD_LINE(OPT_ARG), VALID_RANGE(10, 1024), DEFAULT(256), BLOCK_SIZE(1));
@ -1619,7 +1616,7 @@ static Sys_var_bit Sys_log_slow_slave_statements(
 static Sys_var_ulong Sys_log_warnings(
       "log_warnings",
-       "Log some non critical warnings to the error log."
+       "Log some non-critical warnings to the error log. "
       "Value can be between 0 and 11. Higher values mean more verbosity",
       SESSION_VAR(log_warnings),
       CMD_LINE(OPT_ARG, 'W'),
@ -1907,14 +1904,16 @@ static Sys_var_ulong Sys_metadata_locks_cache_size(
       "metadata_locks_cache_size", "Unused",
       READ_ONLY GLOBAL_VAR(mdl_locks_cache_size), CMD_LINE(REQUIRED_ARG),
       VALID_RANGE(1, 1024*1024), DEFAULT(1024),
-       BLOCK_SIZE(1));
+       BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
       DEPRECATED(1105, ""));
 static ulong mdl_locks_hash_partitions;
 static Sys_var_ulong Sys_metadata_locks_hash_instances(
       "metadata_locks_hash_instances", "Unused",
       READ_ONLY GLOBAL_VAR(mdl_locks_hash_partitions), CMD_LINE(REQUIRED_ARG),
       VALID_RANGE(1, 1024), DEFAULT(8),
-       BLOCK_SIZE(1));
+       BLOCK_SIZE(1), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(0),
       DEPRECATED(1105, ""));
 static Sys_var_on_access_session<Sys_var_ulonglong,
                                 PRIV_SET_SYSTEM_SESSION_VAR_PSEUDO_THREAD_ID>
@ -2003,7 +2002,7 @@ Sys_gtid_seq_no(
 #ifdef HAVE_REPLICATION
 static unsigned char opt_gtid_binlog_pos_dummy;
 static Sys_var_gtid_binlog_pos Sys_gtid_binlog_pos(
-       "gtid_binlog_pos", "Last GTID logged to the binary log, per replication"
+       "gtid_binlog_pos", "Last GTID logged to the binary log, per replication "
       "domain",
       READ_ONLY GLOBAL_VAR(opt_gtid_binlog_pos_dummy), NO_CMD_LINE);
@ -2852,9 +2851,9 @@ export sys_var *Sys_old_passwords_ptr= &Sys_old_passwords; // for sql_acl.cc
 static Sys_var_ulong Sys_open_files_limit(
       "open_files_limit",
-       "If this is not 0, then mysqld will use this value to reserve file "
+       "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 max_connections*5 or max_connections + "
+       "then mariadbd will reserve max_connections*5 or max_connections + "
       "table_cache*2 (whichever is larger) number of file descriptors",
       AUTO_SET READ_ONLY GLOBAL_VAR(open_files_limit), CMD_LINE(REQUIRED_ARG),
       VALID_RANGE(0, OS_FILE_LIMIT), DEFAULT(0), BLOCK_SIZE(1));
@ -2893,7 +2892,7 @@ static Sys_var_ulong Sys_optimizer_use_condition_selectivity(
       "not backed by 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."
+       "a partial join. "
       "5 - additionally use selectivity of certain non-range predicates "
       "calculated on record samples",
       SESSION_VAR(optimizer_use_condition_selectivity), CMD_LINE(REQUIRED_ARG),
@ -2997,7 +2996,7 @@ static Sys_var_ulong Sys_optimizer_adjust_secondary_key_costs(
    DEPRECATED(1100, ""));
 static Sys_var_charptr_fscs Sys_pid_file(
-       "pid_file", "Pid file used by safe_mysqld",
+       "pid_file", "Pid file used by mariadbd-safe",
       READ_ONLY GLOBAL_VAR(pidfile_name_ptr), CMD_LINE(REQUIRED_ARG),
       DEFAULT(0));
@ -3783,7 +3782,7 @@ static Sys_var_on_access_global<Sys_var_uint,
               PRIV_SET_SYSTEM_GLOBAL_VAR_RPL_SEMI_SYNC_SLAVE_KILL_CONN_TIMEOUT>
 Sys_semisync_slave_kill_conn_timeout(
       "rpl_semi_sync_slave_kill_conn_timeout",
-       "Timeout for the mysql connection used to kill the slave io_thread's "
+       "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",
       GLOBAL_VAR(rpl_semi_sync_slave_kill_conn_timeout),
@ -4187,8 +4186,10 @@ static Sys_var_on_access_global<Sys_var_enum,
                                PRIV_SET_SYSTEM_GLOBAL_VAR_THREAD_POOL>
 Sys_thread_pool_priority(
  "thread_pool_priority",
-  "Threadpool priority. High priority connections usually start executing earlier than low priority."
+  "Threadpool priority. High priority connections usually start executing "
-  "If priority set to 'auto', the the actual priority(low or high) is determined based on whether or not connection is inside transaction",
+  "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",
  SESSION_VAR(threadpool_priority), CMD_LINE(REQUIRED_ARG),
  threadpool_priority_names, DEFAULT(TP_PRIORITY_AUTO));
@ -4196,7 +4197,7 @@ static Sys_var_on_access_global<Sys_var_uint,
                                PRIV_SET_SYSTEM_GLOBAL_VAR_THREAD_POOL>
 Sys_threadpool_idle_thread_timeout(
  "thread_pool_idle_timeout",
-  "Timeout in seconds for an idle thread in the thread pool."
+  "Timeout in seconds for an idle thread in the thread pool. "
  "Worker thread will be shut down after timeout",
  GLOBAL_VAR(threadpool_idle_timeout), CMD_LINE(REQUIRED_ARG),
  VALID_RANGE(1, UINT_MAX), DEFAULT(60), BLOCK_SIZE(1)
@ -4225,8 +4226,8 @@ static Sys_var_on_access_global<Sys_var_uint,
                                PRIV_SET_SYSTEM_GLOBAL_VAR_THREAD_POOL>
 Sys_threadpool_stall_limit(
 "thread_pool_stall_limit",
- "Maximum query execution time in milliseconds,"
+ "Maximum query execution time in milliseconds, "
- "before an executing non-yielding thread is considered stalled."
+ "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",
  GLOBAL_VAR(threadpool_stall_limit), CMD_LINE(REQUIRED_ARG),
@ -4292,8 +4293,7 @@ static bool check_tx_isolation(sys_var *self, THD *thd, set_var *var)
 // NO_CMD_LINE - different name of the option
 static Sys_var_tx_isolation Sys_tx_isolation(
-       "tx_isolation", "Default transaction isolation level."
+       "tx_isolation", "Default transaction isolation level",
       "This variable is deprecated and will be removed in a future release",
       SESSION_VAR(tx_isolation), NO_CMD_LINE,
       tx_isolation_names, DEFAULT(ISO_REPEATABLE_READ),
       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_tx_isolation),
@ -4352,8 +4352,7 @@ static Sys_var_tx_read_only Sys_tx_read_only(
       "tx_read_only", "Default transaction access mode. If set to OFF, "
       "the default, access is read/write. If set to ON, access is read-only. "
       "The SET TRANSACTION statement can also change the value of this variable. "
-       "See SET TRANSACTION and START TRANSACTION."
+       "See SET TRANSACTION and START TRANSACTION",
       "This variable is deprecated and will be removed in a future release",
       SESSION_VAR(tx_read_only), NO_CMD_LINE, DEFAULT(0),
       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_tx_read_only),
       ON_UPDATE(0), DEPRECATED(1101, "transaction_read_only"));
@ -4530,11 +4529,11 @@ static Sys_var_on_access_global<Sys_var_pluginlist,
                               PRIV_SET_SYSTEM_GLOBAL_VAR_GTID_POS_AUTO_ENGINES>
 Sys_gtid_pos_auto_engines(
       "gtid_pos_auto_engines",
-       "List of engines for which to automatically create a "
+       "List of engines for which a dedicated mysql.gtid_slave_pos_ENGINE "
-       "mysql.gtid_slave_pos_ENGINE table, if a transaction using that engine "
+       "table is created automatically, if a transaction using that engine "
-       "is replicated. This can be used to avoid introducing cross-engine "
+       "is replicated. This helps to avoid cross-engine "
-       "transactions, if engines are used different from that used by table "
+       "transactions, as would be the case when user tables and "
-       "mysql.gtid_slave_pos",
+       "mysql.gtid_slave_pos were created in different transactional engines",
       GLOBAL_VAR(opt_gtid_pos_auto_plugins), NO_CMD_LINE,
       DEFAULT(&gtid_pos_auto_engines),
       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(check_gtid_pos_auto_engines));
@ -4618,9 +4617,10 @@ static bool fix_autocommit(sys_var *self, THD *thd, enum_var_type type)
 static Sys_var_bit Sys_autocommit(
       "autocommit", "If set to 1, the default, all queries are committed "
-       "immediately. If set to 0, they are only committed upon a COMMIT statement"
+       "immediately. If set to 0, they are only committed upon a COMMIT "
-       ", or rolled back with a ROLLBACK statement. If autocommit is set to 0, "
+       "statement, or rolled back with a ROLLBACK statement. If autocommit is "
-       "and then changed to 1, all open transactions are immediately committed",
+       "set to 0, and then changed to 1, all open transactions are immediately "
       "committed",
       NO_SET_STMT SESSION_VAR(option_bits), NO_CMD_LINE,
       OPTION_AUTOCOMMIT, DEFAULT(TRUE),
       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0), ON_UPDATE(fix_autocommit));
@ -5137,9 +5137,9 @@ Sys_proxy_protocol_networks(
    "proxy_protocol_networks", "Enable proxy protocol for these source "
    "networks. The 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 "
+    "a single host. \"*\" represents all networks and must be the only "
-    "directive on the line. String \"localhost\" represents non-TCP "
+    "directive on the line. String \"localhost\" represents non-TCP local "
-    "local connections (Unix domain socket, Windows named pipe or shared memory)",
+    "connections (Unix domain socket, Windows named pipe or shared memory)",
    GLOBAL_VAR(my_proxy_protocol_networks), CMD_LINE(REQUIRED_ARG),
    DEFAULT(""), NO_MUTEX_GUARD, NOT_IN_BINLOG,
    ON_CHECK(check_proxy_protocol_networks), ON_UPDATE(fix_proxy_protocol_networks));
@ -5319,7 +5319,7 @@ static Sys_var_have Sys_have_rtree_keys(
 static Sys_var_have Sys_have_ssl(
       "have_ssl", "If the server supports secure connections, will be set to YES, "
       "otherwise will be set to NO. If set to DISABLED, the server was compiled with "
-       "TLS support, but was not started with TLS support (see the mysqld options). "
+       "TLS support, but was not started with TLS support (see the mariadbd options). "
       "See also have_openssl",
       READ_ONLY GLOBAL_VAR(have_ssl), NO_CMD_LINE);
@ -5360,7 +5360,7 @@ static bool fix_log_state(sys_var *self, THD *thd, enum_var_type type);
 static Sys_var_mybool Sys_general_log(
       "general_log", "Log connections and queries to a table or log file. "
       "Defaults logging to a file 'hostname'.log or a table mysql.general_log"
-       "if --log-output=TABLE is used",
+       " if --log-output=TABLE is used",
       GLOBAL_VAR(opt_log), CMD_LINE(OPT_ARG),
       DEFAULT(FALSE), NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
       ON_UPDATE(fix_log_state));
@ -5682,7 +5682,7 @@ static Sys_var_binlog_filter Sys_binlog_do_db(
 static Sys_var_rpl_filter Sys_replicate_rewrite_db(
       "replicate_rewrite_db", OPT_REPLICATE_REWRITE_DB,
       "Tells the slave to replicate binlog events "
-       "into a different database than their original target on the master."
+       "into a different database than their original target on the master. "
       "Example: replicate-rewrite-db=master_db_name->slave_db_name",
       PRIV_SET_SYSTEM_GLOBAL_VAR_REPLICATE_REWRITE_DB);
@ -6342,7 +6342,8 @@ static Sys_var_mybool Sys_wsrep_log_conflicts(
       GLOBAL_VAR(wsrep_log_conflicts), CMD_LINE(OPT_ARG), DEFAULT(FALSE));
 static Sys_var_ulong Sys_wsrep_mysql_replication_bundle(
-      "wsrep_mysql_replication_bundle", "mysql replication group commit",
+      "wsrep_mysql_replication_bundle",
      "Number of replication events that are grouped together",
       GLOBAL_VAR(wsrep_mysql_replication_bundle), CMD_LINE(REQUIRED_ARG),
       VALID_RANGE(0, 1000), DEFAULT(0), BLOCK_SIZE(1));
@ -6461,23 +6462,25 @@ vio_keepalive_opts opt_vio_keepalive;
 static Sys_var_int Sys_keepalive_time(
       "tcp_keepalive_time",
-       "Timeout, in seconds, with no activity until the first TCP keep-alive packet is sent."
+       "Timeout, in seconds, with no activity until the first TCP keep-alive "
-       "If set to 0, system dependent default is used",
+       "packet is sent. If set to 0, system dependent default is used",
       AUTO_SET GLOBAL_VAR(opt_vio_keepalive.idle),
       CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, INT_MAX32/1000), DEFAULT(0),
       BLOCK_SIZE(1));
 static Sys_var_int Sys_keepalive_interval(
       "tcp_keepalive_interval",
-       "The interval, in seconds, between when successive keep-alive packets are sent if no acknowledgement is received."
+       "The interval, in seconds, between when successive keep-alive packets "
-       "If set to 0, system dependent default is used",
+       "are sent if no acknowledgement is received. If set to 0, system "
       "dependent default is used",
       AUTO_SET GLOBAL_VAR(opt_vio_keepalive.interval),
       CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, INT_MAX32/1000), DEFAULT(0),
       BLOCK_SIZE(1));
 static Sys_var_int Sys_keepalive_probes(
       "tcp_keepalive_probes",
-       "The number of unacknowledged probes to send before considering the connection dead and notifying the application layer."
+       "The number of unacknowledged probes to send before considering the "
       "connection dead and notifying the application layer. "
       "If set to 0, system dependent default is used",
       AUTO_SET GLOBAL_VAR(opt_vio_keepalive.probes),
       CMD_LINE(REQUIRED_ARG), VALID_RANGE(0, INT_MAX32/1000), DEFAULT(0),
@ -6596,7 +6599,10 @@ static const char *log_slow_filter_names[]=
 static Sys_var_set Sys_log_slow_filter(
       "log_slow_filter",
-       "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",
+       "Log only certain types of queries to the slow log. If 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",
       SESSION_VAR(log_slow_filter), CMD_LINE(REQUIRED_ARG),
       log_slow_filter_names,
       /* by default we log all queries except 'not_using_index' */
@ -6870,12 +6876,11 @@ Sys_binlog_row_image(
       "before and after image are 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 "
+       "'NOBLOB', 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. "
+       "before image, and only changed columns are logged in the after image",
       "(Default: FULL)",
       SESSION_VAR(binlog_row_image), CMD_LINE(REQUIRED_ARG),
       binlog_row_image_names, DEFAULT(BINLOG_ROW_IMAGE_FULL));
@ -6884,10 +6889,10 @@ static Sys_var_on_access_global<Sys_var_enum,
                                PRIV_SET_SYSTEM_GLOBAL_VAR_BINLOG_ROW_METADATA>
 Sys_binlog_row_metadata(
       "binlog_row_metadata",
-       "Controls whether metadata is logged using FULL , MINIMAL format and NO_LOG."
+       "Controls whether metadata is logged using FULL , MINIMAL format and "
-       "FULL causes all metadata to be logged; MINIMAL means that only "
+       "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."
+       "metadata actually required by slave is logged; NO_LOG NO metadata will "
-       "Default: NO_LOG",
+       "be logged",
       GLOBAL_VAR(binlog_row_metadata), CMD_LINE(REQUIRED_ARG),
       binlog_row_metadata_names, DEFAULT(Table_map_log_event::BINLOG_ROW_METADATA_NO_LOG),
       NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(NULL),
@ -7119,7 +7124,7 @@ static Sys_var_enum Sys_session_track_transaction_info(
       "STATE to track just transaction state (Is there 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,"
+       "the same characteristics (isolation level, read only/read write, "
       "snapshot - but not any work done / data modified within the "
       "transaction)",
       SESSION_VAR(session_track_transaction_info),
@ -7255,7 +7260,7 @@ static Sys_var_engine_optimizer_cost Sys_optimizer_key_copy_cost(
 static Sys_var_engine_optimizer_cost Sys_optimizer_index_block_copy_cost(
  "optimizer_index_block_copy_cost",
-  "Cost of copying a key block from the cache to intern storage as part of "
+  "Cost of copying a key block from the cache to internal storage as part of "
  "an index scan",
  COST_VAR(index_block_copy_cost),
  CMD_LINE(REQUIRED_ARG, OPT_COSTS_INDEX_BLOCK_COPY_COST),
--- a/storage/innobase/handler/ha_innodb.cc
+++ b/storage/innobase/handler/ha_innodb.cc
@ -19312,8 +19312,7 @@ static my_bool innodb_prefix_index_cluster_optimization;
 static MYSQL_SYSVAR_BOOL(prefix_index_cluster_optimization,
  innodb_prefix_index_cluster_optimization,
  PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_DEPRECATED,
-  "Deprecated parameter with no effect",
+  "Unused", nullptr, nullptr, FALSE);
  nullptr, nullptr, TRUE);
 static MYSQL_SYSVAR_STR(data_file_path, innobase_data_file_path,
  PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
@ -19350,7 +19349,7 @@ static ulong innodb_purge_rseg_truncate_frequency;
 static MYSQL_SYSVAR_ULONG(purge_rseg_truncate_frequency,
  innodb_purge_rseg_truncate_frequency,
  PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_DEPRECATED,
-  "Deprecated parameter with no effect",
+  "Unused",
  NULL, NULL, 128, 1, 128, 0);
 static void innodb_undo_log_truncate_update(THD *thd, struct st_mysql_sys_var*,
@ -19424,7 +19423,7 @@ static MYSQL_SYSVAR_ENUM(stats_method, srv_innodb_stats_method,
 static MYSQL_SYSVAR_ULONG(buf_dump_status_frequency, srv_buf_dump_status_frequency,
  PLUGIN_VAR_RQCMDARG,
-  "A number between [0, 100] that tells how oftern buffer pool dump status "
+  "A number that tells how often buffer pool dump status "
  "in percentages should be printed. E.g. 10 means that buffer pool dump "
  "status is printed when every 10% of number of buffer pool pages are "
  "dumped. Default is 0 (only start and end status is printed)",
@ -19639,7 +19638,7 @@ static MYSQL_SYSVAR_BOOL(immediate_scrub_data_uncompressed,
 static MYSQL_SYSVAR_BOOL(encrypt_temporary_tables, innodb_encrypt_temporary_tables,
  PLUGIN_VAR_OPCMDARG | PLUGIN_VAR_READONLY,
-  "Enrypt the temporary table data",
+  "Encrypt the temporary table data",
  NULL, NULL, false);
 static MYSQL_SYSVAR_BOOL(truncate_temporary_tablespace_now,
--- a/storage/myisam/ha_myisam.cc
+++ b/storage/myisam/ha_myisam.cc
@ -87,7 +87,7 @@ static MYSQL_SYSVAR_BOOL(use_mmap, opt_myisam_use_mmap, PLUGIN_VAR_NOCMDARG,
 static MYSQL_SYSVAR_ULONGLONG(mmap_size, myisam_mmap_size,
  PLUGIN_VAR_RQCMDARG|PLUGIN_VAR_READONLY, "Restricts the total memory "
-  "used for memory mapping of MySQL tables", NULL, NULL,
+  "used for memory mapping of MyISAM tables", NULL, NULL,
  SIZE_T_MAX, MEMMAP_EXTRA_MARGIN, SIZE_T_MAX, 1);
 static MYSQL_THDVAR_ENUM(stats_method, PLUGIN_VAR_RQCMDARG,