mirror of
https://github.com/MariaDB/server.git
synced 2025-07-29 05:21:33 +03:00
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
This commit is contained in:
@ -1,17 +1,15 @@
|
||||
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
|
||||
|
Reference in New Issue
Block a user