MDEV-28671 post-merge fixes

* use new deprecated printer for all deprecated server options
* restore alphabetic option sorting order
* move deprecated printer from mysqld.cc to my_getopt.c
* in --help print deprecation message at the end of the option help
* move 'ALL' help text where it belongs - to other SET options, and
  with a correct indentation.
* consistently end all or none command-line option help strings
  with a dot - my_print_help() needs that.
  It's about 50/50 now, so let's do none, less line wraps in --help
* remove trailing spaces from command-line option help strings

mysql-test/main/mysqld--help,aix.rdiff

-diff --git a/mysql-test/main/mysqld--help.result b/mysql-test/main/mysqld--help.result
-index 7b0ce27ead3..38176dcaa86 100644
 --- a/mysql-test/main/mysqld--help.result
 +++ b/mysql-test/main/mysqld--help.result
-@@ -1301,8 +1301,6 @@ The following specify which files/extra groups are read (specified before remain
+@@ -1441,8 +1441,6 @@
   WHERE clause, or a LIMIT clause, or else they will
   aborted. Prevents the common mistake of accidentally
-  deleting or updating every row in a table.
+  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.)
   --standard-compliant-cte 
   Allow only CTEs compliant to SQL standard
   (Defaults to on; use --skip-standard-compliant-cte to disable.)
-@@ -1367,39 +1365,6 @@ The following specify which files/extra groups are read (specified before remain
+@@ -1511,39 +1509,6 @@
   --thread-cache-size=# 
   How many threads we should keep in a cache for reuse.
   These are freed after 5 minutes of idle time
@@ -28,7 +26,7 @@ index 7b0ce27ead3..38176dcaa86 100644
 - pool
 - --thread-pool-oversubscribe=# 
 - How many additional active worker threads in a group are
-- allowed.
+- allowed
 - --thread-pool-prio-kickup-timer=# 
 - The number of milliseconds before a dequeued low-priority
 - statement is moved to the high-priority queue
@@ -37,21 +35,21 @@ index 7b0ce27ead3..38176dcaa86 100644
 - 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.
+- transaction
 - --thread-pool-size=# 
 - Number of thread groups in the pool. This parameter is
 - roughly equivalent to maximum number of concurrently
 - executing threads (threads in a waiting state do not
-- count as executing).
+- count as executing)
 - --thread-pool-stall-limit=# 
 - 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.
+- created to handle remaining clients
   --thread-stack=#    The stack size for each thread
-  --time-format=name  The TIME format (ignored)
-  --tls-version=name  TLS protocol version for secure connections.. Any
-@@ -1788,7 +1753,6 @@ slow-query-log FALSE
+  --tls-version=name  TLS protocol version for secure connections. Any
+  combination of: TLSv1.0, TLSv1.1, TLSv1.2, TLSv1.3, or
+@@ -1965,7 +1930,6 @@
  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
@@ -59,7 +57,7 @@ index 7b0ce27ead3..38176dcaa86 100644
  standard-compliant-cte TRUE
  stored-program-cache 256
  strict-password-validation TRUE
-@@ -1807,14 +1771,6 @@ tcp-keepalive-probes 0
+@@ -1985,14 +1949,6 @@
  tcp-keepalive-time 0
  tcp-nodelay TRUE
  thread-cache-size 151
@@ -72,5 +70,5 @@ index 7b0ce27ead3..38176dcaa86 100644
 -thread-pool-priority auto
 -thread-pool-stall-limit 500
  thread-stack 299008
- time-format %H:%i:%s
  tmp-disk-table-size 18446744073709551615
+ tmp-memory-table-size 16777216

mysql-test/main/mysqld--help,win.rdiff

---- main/mysqld--help.result	2023-11-30 02:21:51.951132200 +0100
-+++ main/mysqld--help,win.reject	2023-11-30 02:35:44.404612300 +0100
-@@ -191,6 +191,7 @@
+--- a/mysql-test/main/mysqld--help.result
++++ b/mysql-test/main/mysqld--help.result
+@@ -220,6 +220,7 @@
   --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
-  --date-format=name  The DATE format (ignored)
-  --datetime-format=name 
-@@ -696,6 +697,7 @@
+  --deadlock-search-depth-long=# 
+  Long search depth for the two-step deadlock detection
+@@ -722,6 +723,7 @@
   Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME,
-  DATETIME, TIMESTAMP columns.
+  DATETIME, TIMESTAMP columns
   (Defaults to on; use --skip-mysql56-temporal-format to disable.)
 + --named-pipe        Enable the named pipe (NT)
   --net-buffer-length=# 
   Buffer length for TCP/IP and socket communication
   --net-read-timeout=# 
-@@ -1351,6 +1353,10 @@
+@@ -1419,6 +1421,10 @@
   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(Default: 15000)
   --socket=name       Socket file to use for connection
   --sort-buffer-size=# 
   Each thread that needs to do a sort allocates a buffer of
-@@ -1376,6 +1382,7 @@
-  deleting or updating every row in a table.
+@@ -1443,6 +1449,7 @@
+  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.)
-+ --standalone        Dummy option to start as a standalone program (NT).
++ --standalone        Dummy option to start as a standalone program (NT)
   --standard-compliant-cte 
   Allow only CTEs compliant to SQL standard
   (Defaults to on; use --skip-standard-compliant-cte to disable.)
-@@ -1454,6 +1461,11 @@
+@@ -1522,6 +1529,11 @@
   --thread-pool-max-threads=# 
   Maximum allowed number of worker threads in the thread
   pool
 + --thread-pool-min-threads=# 
-+ Minimum number of threads in the thread pool.
++ Minimum number of threads in the thread pool
 + --thread-pool-mode=name 
 + Chose implementation of the threadpool. One of: windows, 
 + generic
   --thread-pool-oversubscribe=# 
   How many additional active worker threads in a group are
-  allowed.
-@@ -1493,8 +1505,8 @@
+  allowed
+@@ -1560,8 +1572,8 @@
   automatically convert it to an on-disk MyISAM or Aria
-  table.
+  table
   -t, --tmpdir=name   Path for temporary files. Several paths may be specified,
 - separated by a colon (:), in this case they are used in a
 - round-robin fashion
@@ -58,7 +58,7 @@
   --transaction-alloc-block-size=# 
   Allocation block size for transactions to be stored in
   binary log
-@@ -1716,6 +1728,7 @@
+@@ -1788,6 +1800,7 @@
  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
-@@ -1874,6 +1887,7 @@
+@@ -1962,6 +1975,7 @@
  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
-@@ -1901,6 +1915,8 @@
+@@ -1989,6 +2003,8 @@
  thread-pool-exact-stats FALSE
  thread-pool-idle-timeout 60
  thread-pool-max-threads 65536

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

 flush tables;
+[Warning] --table-cache is deprecated and will be removed in a future release. Please use --table-open-cache instead.
 #
 # Check that we don't write any data to wrong or not existing datadir
 #
+[Warning] --table-cache is deprecated and will be removed in a future release. Please use --table-open-cache instead.
 [Warning] Could not open mysql.plugin table: "Table 'mysql.plugin' doesn't exist". Some options may be missing from the help text
 #
 # Check with existing directory
 #
+[Warning] --table-cache is deprecated and will be removed in a future release. Please use --table-open-cache instead.
 [Warning] Could not open mysql.plugin table: "Table 'mysql.plugin' doesn't exist". Some options may be missing from the help text

mysql-test/main/statistics_json.result

@@ -7392,7 +7392,7 @@ DROP TABLE t1;
 #
 select variable_comment from information_schema.system_variables where VARIABLE_NAME='HISTOGRAM_TYPE';
 variable_comment
-Specifies type of the histograms created by ANALYZE. Possible values are: SINGLE_PREC_HB - single precision height-balanced, DOUBLE_PREC_HB - double precision height-balanced, JSON_HB - height-balanced, stored as JSON.
+Specifies type of the histograms created by ANALYZE. Possible values are: SINGLE_PREC_HB - single precision height-balanced, DOUBLE_PREC_HB - double precision height-balanced, JSON_HB - height-balanced, stored as JSON
 #
 # MDEV-26709: JSON histogram may contain bucketS than histogram_size allows
 #

mysql-test/suite/sys_vars/r/sysvars_aria,32bit.rdiff

@@ -6,7 +6,7 @@
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Block size to be used for Aria index pages.
+ VARIABLE_COMMENT	Block size to be used for Aria index pages
  NUMERIC_MIN_VALUE	4096
  NUMERIC_MAX_VALUE	32768
 @@ -17,7 +17,7 @@
@@ -15,7 +15,7 @@
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing.
+ VARIABLE_COMMENT	Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
 @@ -29,7 +29,7 @@
@@ -24,7 +24,7 @@
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log.
+ VARIABLE_COMMENT	Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	4294967295
 @@ -53,7 +53,7 @@
@@ -33,7 +33,7 @@
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature.
+ VARIABLE_COMMENT	Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	255
 @@ -77,7 +77,7 @@
@@ -60,7 +60,7 @@
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache.
+ VARIABLE_COMMENT	This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache
  NUMERIC_MIN_VALUE	100
 -NUMERIC_MAX_VALUE	18446744073709551615
 +NUMERIC_MAX_VALUE	4294967295
@@ -82,7 +82,7 @@
  VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files.
+ VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files
  NUMERIC_MIN_VALUE	128
  NUMERIC_MAX_VALUE	16384
 @@ -209,7 +209,7 @@
@@ -91,12 +91,12 @@
  VARIABLE_SCOPE	SESSION
 -VARIABLE_TYPE	BIGINT UNSIGNED
 +VARIABLE_TYPE	INT UNSIGNED
- VARIABLE_COMMENT	Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair.
+ VARIABLE_COMMENT	Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair
  NUMERIC_MIN_VALUE	1
  NUMERIC_MAX_VALUE	128
 @@ -224,7 +224,7 @@
  VARIABLE_TYPE	BIGINT UNSIGNED
- VARIABLE_COMMENT	The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.
+ VARIABLE_COMMENT	The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE
  NUMERIC_MIN_VALUE	16376
 -NUMERIC_MAX_VALUE	1152921504606846975
 +NUMERIC_MAX_VALUE	268435455

mysql-test/suite/sys_vars/r/sysvars_aria.result

@@ -6,7 +6,7 @@ SESSION_VALUE	NULL
 DEFAULT_VALUE	8192
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Block size to be used for Aria index pages.
+VARIABLE_COMMENT	Block size to be used for Aria index pages
 NUMERIC_MIN_VALUE	4096
 NUMERIC_MAX_VALUE	32768
 NUMERIC_BLOCK_SIZE	1024
@@ -18,7 +18,7 @@ SESSION_VALUE	NULL
 DEFAULT_VALUE	30
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing.
+VARIABLE_COMMENT	Interval between tries to do an automatic checkpoints. In seconds; 0 means 'no automatic checkpoints' which makes sense only for testing
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	1
@@ -30,7 +30,7 @@ SESSION_VALUE	NULL
 DEFAULT_VALUE	1048576
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log.
+VARIABLE_COMMENT	Number of bytes that the transaction log has to grow between checkpoints before a new checkpoint is written to the log
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	4294967295
 NUMERIC_BLOCK_SIZE	1
@@ -54,7 +54,7 @@ SESSION_VALUE	NULL
 DEFAULT_VALUE	0
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature.
+VARIABLE_COMMENT	Number of consecutive log recovery failures after which logs will be automatically deleted to cure the problem; 0 (the default) disables the feature
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	255
 NUMERIC_BLOCK_SIZE	1
@@ -126,7 +126,7 @@ SESSION_VALUE	NULL
 DEFAULT_VALUE	9223372036853727232
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Don't use the fast sort index method to created index if the temporary file would get bigger than this.
+VARIABLE_COMMENT	Don't use the fast sort index method to created index if the temporary file would get bigger than this
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	9223372036854775807
 NUMERIC_BLOCK_SIZE	1048576
@@ -138,7 +138,7 @@ SESSION_VALUE	NULL
 DEFAULT_VALUE	300
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache.
+VARIABLE_COMMENT	This characterizes the number of hits a hot block has to be untouched until it is considered aged enough to be downgraded to a warm block. This specifies the percentage ratio of that number of hits to the total number of blocks in the page cache
 NUMERIC_MIN_VALUE	100
 NUMERIC_MAX_VALUE	18446744073709551615
 NUMERIC_BLOCK_SIZE	100
@@ -150,7 +150,7 @@ SESSION_VALUE	NULL
 DEFAULT_VALUE	134217728
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	The size of the buffer used for index blocks for Aria 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 Aria tables. Increase this to get better index handling (for all reads and multiple writes) to as much as you can afford
 NUMERIC_MIN_VALUE	131072
 NUMERIC_MAX_VALUE	18446744073709551615
 NUMERIC_BLOCK_SIZE	1
@@ -174,7 +174,7 @@ SESSION_VALUE	NULL
 DEFAULT_VALUE	512
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files.
+VARIABLE_COMMENT	Number of hash buckets for open and changed files.  If you have a lot of Aria files open you should increase this for faster flush of changes. A good value is probably 1/10 of number of possible open Aria files
 NUMERIC_MIN_VALUE	128
 NUMERIC_MAX_VALUE	16384
 NUMERIC_BLOCK_SIZE	1
@@ -210,7 +210,7 @@ SESSION_VALUE	1
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair.
+VARIABLE_COMMENT	Number of threads to use when repairing Aria tables. The value of 1 disables parallel repair
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	128
 NUMERIC_BLOCK_SIZE	1
@@ -222,7 +222,7 @@ SESSION_VALUE	268434432
 DEFAULT_VALUE	268434432
 VARIABLE_SCOPE	SESSION
 VARIABLE_TYPE	BIGINT UNSIGNED
-VARIABLE_COMMENT	The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE.
+VARIABLE_COMMENT	The buffer that is allocated when sorting the index when doing a REPAIR or when creating indexes with CREATE INDEX or ALTER TABLE
 NUMERIC_MIN_VALUE	16376
 NUMERIC_MAX_VALUE	1152921504606846975
 NUMERIC_BLOCK_SIZE	1

mysql-test/suite/sys_vars/r/sysvars_server_notembedded,aix.rdiff

 --- a/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
 +++ b/mysql-test/suite/sys_vars/r/sysvars_server_notembedded.result
-@@ -4639,99 +4639,9 @@
+@@ -4649,99 +4649,9 @@
  NUMERIC_MIN_VALUE	NULL
  NUMERIC_MAX_VALUE	NULL
  NUMERIC_BLOCK_SIZE	NULL
@@ -51,7 +51,7 @@
 -VARIABLE_NAME	THREAD_POOL_OVERSUBSCRIBE
 -VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	INT UNSIGNED
--VARIABLE_COMMENT	How many additional active worker threads in a group are allowed.
+-VARIABLE_COMMENT	How many additional active worker threads in a group are allowed
 -NUMERIC_MIN_VALUE	1
 -NUMERIC_MAX_VALUE	1000
 -NUMERIC_BLOCK_SIZE	1
@@ -61,7 +61,7 @@
 -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
@@ -81,7 +81,7 @@
 -VARIABLE_NAME	THREAD_POOL_SIZE
 -VARIABLE_SCOPE	GLOBAL
 -VARIABLE_TYPE	INT UNSIGNED
--VARIABLE_COMMENT	Number of thread groups in the pool. This parameter is roughly equivalent to maximum number of concurrently executing threads (threads in a waiting state do not count as executing).
+-VARIABLE_COMMENT	Number of thread groups in the pool. This parameter is roughly equivalent to maximum number of concurrently executing threads (threads in a waiting state do not count as executing)
 -NUMERIC_MIN_VALUE	1
 -NUMERIC_MAX_VALUE	100000
 -NUMERIC_BLOCK_SIZE	1
@@ -91,7 +91,7 @@
 -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

mysql-test/suite/sys_vars/r/sysvars_star.result

@@ -78,7 +78,7 @@ GLOBAL_VALUE_ORIGIN	COMMAND-LINE
 DEFAULT_VALUE	1
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	Sampling rate. If set to 0(zero), the logging is disabled.
+VARIABLE_COMMENT	Sampling rate. If set to 0(zero), the logging is disabled
 NUMERIC_MIN_VALUE	0
 NUMERIC_MAX_VALUE	1000000
 NUMERIC_BLOCK_SIZE	1
@@ -93,7 +93,7 @@ GLOBAL_VALUE_ORIGIN	CONFIG
 DEFAULT_VALUE	9
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	INT UNSIGNED
-VARIABLE_COMMENT	Number of rotations before log is removed.
+VARIABLE_COMMENT	Number of rotations before log is removed
 NUMERIC_MIN_VALUE	1
 NUMERIC_MAX_VALUE	999
 NUMERIC_BLOCK_SIZE	1

mysql-test/suite/sys_vars/r/sysvars_wsrep,32bit.rdiff

 --- a/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
 +++ b/mysql-test/suite/sys_vars/r/sysvars_wsrep.result
-@@ -307,7 +307,7 @@
+@@ -292,7 +292,7 @@
  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
-@@ -322,7 +322,7 @@
+@@ -307,7 +307,7 @@
  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
-@@ -352,7 +352,7 @@
+@@ -337,7 +337,7 @@
  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	mysql replication group commit
  NUMERIC_MIN_VALUE	0
  NUMERIC_MAX_VALUE	1000
-@@ -547,7 +547,7 @@
+@@ -532,7 +532,7 @@
  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
-@@ -577,7 +577,7 @@
+@@ -562,7 +562,7 @@
  GLOBAL_VALUE_ORIGIN	COMPILE-TIME
  DEFAULT_VALUE	1
  VARIABLE_SCOPE	GLOBAL

mysql-test/suite/sys_vars/r/version.result

@@ -10,7 +10,7 @@ GLOBAL_VALUE_ORIGIN	COMMAND-LINE
 DEFAULT_VALUE	NULL
 VARIABLE_SCOPE	GLOBAL
 VARIABLE_TYPE	VARCHAR
-VARIABLE_COMMENT	Server version number. It may also include a suffix with configuration or build information. -debug indicates debugging support was enabled on the server, and -log indicates at least one of the binary log, general log or slow query log are enabled, for example 10.1.1-MariaDB-mariadb1precise-log.
+VARIABLE_COMMENT	Server version number. It may also include a suffix with configuration or build information. -debug indicates debugging support was enabled on the server, and -log indicates at least one of the binary log, general log or slow query log are enabled, for example 10.1.1-MariaDB-mariadb1precise-log
 NUMERIC_MIN_VALUE	NULL
 NUMERIC_MAX_VALUE	NULL
 NUMERIC_BLOCK_SIZE	NULL

plugin/auth_gssapi/server_plugin.cc

@@ -98,7 +98,7 @@ static MYSQL_SYSVAR_STR(keytab_path, srv_keytab_path,
 
 static MYSQL_SYSVAR_STR(principal_name, srv_principal_name,
                         PLUGIN_VAR_RQCMDARG|PLUGIN_VAR_READONLY,
-                        "GSSAPI target name - service principal name for Kerberos authentication.",
+                        "GSSAPI target name - service principal name for Kerberos authentication",
                         NULL,
                         NULL,
                         "");

plugin/aws_key_management/aws_key_management_plugin.cc

@@ -704,7 +704,7 @@ static MYSQL_SYSVAR_STR(master_key_id, master_key_id,
 
 static MYSQL_SYSVAR_ENUM(key_spec, key_spec,
   PLUGIN_VAR_RQCMDARG,
-  "Encryption algorithm used to create new keys.",
+  "Encryption algorithm used to create new keys",
   NULL, NULL, 0, &key_spec_typelib);
 
 
@@ -722,12 +722,12 @@ static MYSQL_SYSVAR_INT(rotate_key, rotate_key,
 
 static MYSQL_SYSVAR_INT(request_timeout, request_timeout,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "Timeout in milliseconds for create HTTPS connection or execute AWS request. Specify 0 to use SDK default.",
+  "Timeout in milliseconds for create HTTPS connection or execute AWS request. Specify 0 to use SDK default",
   NULL, NULL, 0, 0, INT_MAX, 1);
 
 static MYSQL_SYSVAR_STR(region, region,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
-  "AWS region. For example us-east-1, or eu-central-1. If no value provided, SDK default is used.",
+  "AWS region. For example us-east-1, or eu-central-1. If no value provided, SDK default is used",
   NULL, NULL, "");
 
 static MYSQL_SYSVAR_STR(endpoint_url, endpoint_url,
@@ -744,7 +744,7 @@ static MYSQL_SYSVAR_STR(keyfile_dir, keyfile_dir,
 #if WITH_AWS_MOCK
 static MYSQL_SYSVAR_BOOL(mock, mock,
   PLUGIN_VAR_RQCMDARG | PLUGIN_VAR_READONLY,
- "Mock AWS KMS calls (for testing).",
+ "Mock AWS KMS calls (for testing)",
   NULL,  NULL, 0);
 #endif
 

plugin/query_response_time/plugin.cc

@@ -54,7 +54,7 @@ static MYSQL_SYSVAR_BOOL(flush, opt_query_response_time_flush,
 #ifndef DBUG_OFF
 static MYSQL_THDVAR_ULONGLONG(exec_time_debug, PLUGIN_VAR_NOCMDOPT,
        "Pretend queries take this many microseconds. When 0 (the default) use "
-       "the actual execution time. Used only for debugging.",
+       "the actual execution time. Used only for debugging",
        NULL, NULL, 0, 0, LONG_TIMEOUT, 1);
 #endif
 

sql/log.cc

@@ -12516,7 +12516,7 @@ static MYSQL_SYSVAR_BOOL(
   "thread scheduling. On by default. Disable to run each transaction in group "
   "commit in its own thread, which can be slower at very high concurrency. "
   "This option is mostly for testing one algorithm versus the other, and it "
-  "should not normally be necessary to change it.",
+  "should not normally be necessary to change it",
   NULL,
   NULL,
   1);