mirror of
https://github.com/MariaDB/server.git
synced 2025-08-01 03:47:19 +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,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
|
||||
@ -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
|
||||
|
Reference in New Issue
Block a user