1
0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00

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
This commit is contained in:
Sergei Golubchik
2024-05-03 19:19:03 +02:00
parent 53582238a3
commit 5296f908ed
14 changed files with 430 additions and 430 deletions

View File

@ -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