Skip to content

Commit

Permalink
MDEV-28671 post-merge fixes
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
vuvova committed May 27, 2024
1 parent 4186fa7 commit df10a94
Show file tree
Hide file tree
Showing 42 changed files with 1,704 additions and 1,756 deletions.
26 changes: 12 additions & 14 deletions mysql-test/main/mysqld--help,aix.rdiff
Original file line number Diff line number Diff line change
@@ -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
Expand All @@ -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
Expand All @@ -37,29 +35,29 @@ 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
-stack-trace TRUE
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
Expand All @@ -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
42 changes: 21 additions & 21 deletions mysql-test/main/mysqld--help,win.rdiff
Original file line number Diff line number Diff line change
@@ -1,55 +1,55 @@
--- 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
Expand All @@ -58,23 +58,23 @@
--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
+named-pipe FALSE
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
+slow-start-timeout 15000
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
Expand Down
3 changes: 3 additions & 0 deletions mysql-test/main/mysqld--help-aria.result
Original file line number Diff line number Diff line change
@@ -1,9 +1,12 @@
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
Loading

0 comments on commit df10a94

Please sign in to comment.