|
1 | 1 | --- mysqld--help.result
|
2 | 2 | +++ mysqld--help,win.reject
|
3 |
| -@@ -333,7 +333,6 @@ |
| 3 | +@@ -337,7 +337,6 @@ The following specify which files/extra groups are read (specified before remain |
4 | 4 | The number of segments in a key cache
|
5 | 5 | -L, --language=name Client error messages in given language. May be given as
|
6 | 6 | a full path. Deprecated. Use --lc-messages-dir instead.
|
7 | 7 | - --large-pages Enable support for large pages
|
8 | 8 | --lc-messages=name Set the language used for the error messages.
|
9 | 9 | -L, --lc-messages-dir=name
|
10 | 10 | Directory where error messages are
|
11 |
| -@@ -533,6 +532,7 @@ |
| 11 | +@@ -537,6 +536,7 @@ The following specify which files/extra groups are read (specified before remain |
12 | 12 | Use MySQL-5.6 (instead of MariaDB-5.3) format for TIME,
|
13 | 13 | DATETIME, TIMESTAMP columns.
|
14 | 14 | (Defaults to on; use --skip-mysql56-temporal-format to disable.)
|
15 | 15 | + --named-pipe Enable the named pipe (NT)
|
16 | 16 | --net-buffer-length=#
|
17 | 17 | Buffer length for TCP/IP and socket communication
|
18 | 18 | --net-read-timeout=#
|
19 |
| -@@ -924,6 +924,9 @@ |
| 19 | +@@ -928,6 +928,9 @@ The following specify which files/extra groups are read (specified before remain |
20 | 20 | files within specified directory
|
21 | 21 | --server-id=# Uniquely identifies the server instance in the community
|
22 | 22 | of replication partners
|
|
26 | 26 | --show-slave-auth-info
|
27 | 27 | Show user and password in SHOW SLAVE HOSTS on this
|
28 | 28 | master.
|
29 |
| -@@ -1034,6 +1037,10 @@ |
| 29 | +@@ -1038,6 +1041,10 @@ The following specify which files/extra groups are read (specified before remain |
30 | 30 | Log slow queries to given log file. Defaults logging to
|
31 | 31 | 'hostname'-slow.log. Must be enabled to activate other
|
32 | 32 | slow log options
|
|
37 | 37 | --socket=name Socket file to use for connection
|
38 | 38 | --sort-buffer-size=#
|
39 | 39 | Each thread that needs to do a sort allocates a buffer of
|
40 |
| -@@ -1052,6 +1059,7 @@ |
| 40 | +@@ -1056,6 +1063,7 @@ The following specify which files/extra groups are read (specified before remain |
41 | 41 | NO_ENGINE_SUBSTITUTION, PAD_CHAR_TO_FULL_LENGTH
|
42 | 42 | --stack-trace Print a symbolic stack trace on failure
|
43 | 43 | (Defaults to on; use --skip-stack-trace to disable.)
|
44 | 44 | + --standalone Dummy option to start as a standalone program (NT).
|
45 | 45 | --stored-program-cache=#
|
46 | 46 | The soft upper limit for number of cached stored routines
|
47 | 47 | for one connection.
|
48 |
| -@@ -1088,25 +1096,11 @@ |
| 48 | +@@ -1092,25 +1100,11 @@ The following specify which files/extra groups are read (specified before remain |
49 | 49 | COMMIT, ROLLBACK
|
50 | 50 | --thread-cache-size=#
|
51 | 51 | How many threads we should keep in a cache for reuse
|
|
73 | 73 | --thread-stack=# The stack size for each thread
|
74 | 74 | --time-format=name The TIME format (ignored)
|
75 | 75 | --timed-mutexes Specify whether to time mutexes. Deprecated, has no
|
76 |
| -@@ -1115,8 +1109,8 @@ |
| 76 | +@@ -1119,8 +1113,8 @@ The following specify which files/extra groups are read (specified before remain |
77 | 77 | size, MariaDB will automatically convert it to an on-disk
|
78 | 78 | MyISAM or Aria table.
|
79 | 79 | -t, --tmpdir=name Path for temporary files. Several paths may be specified,
|
|
84 | 84 | --transaction-alloc-block-size=#
|
85 | 85 | Allocation block size for transactions to be stored in
|
86 | 86 | binary log
|
87 |
| -@@ -1240,7 +1234,6 @@ |
| 87 | +@@ -1244,7 +1238,6 @@ key-cache-block-size 1024 |
88 | 88 | key-cache-division-limit 100
|
89 | 89 | key-cache-file-hash-size 512
|
90 | 90 | key-cache-segments 0
|
91 | 91 | -large-pages FALSE
|
92 | 92 | lc-messages en_US
|
93 | 93 | lc-messages-dir MYSQL_SHAREDIR/
|
94 | 94 | lc-time-names en_US
|
95 |
| -@@ -1307,6 +1300,7 @@ |
| 95 | +@@ -1310,6 +1303,7 @@ myisam-sort-buffer-size 134216704 |
96 | 96 | myisam-stats-method NULLS_UNEQUAL
|
97 | 97 | myisam-use-mmap FALSE
|
98 | 98 | mysql56-temporal-format TRUE
|
99 | 99 | +named-pipe FALSE
|
100 | 100 | net-buffer-length 16384
|
101 | 101 | net-read-timeout 30
|
102 | 102 | net-retry-count 10
|
103 |
| -@@ -1403,6 +1397,8 @@ |
| 103 | +@@ -1406,6 +1400,8 @@ safe-user-create FALSE |
104 | 104 | secure-auth TRUE
|
105 | 105 | secure-file-priv (No default value)
|
106 | 106 | server-id 0
|
|
109 | 109 | show-slave-auth-info FALSE
|
110 | 110 | silent-startup FALSE
|
111 | 111 | skip-grant-tables TRUE
|
112 |
| -@@ -1426,6 +1422,7 @@ |
| 112 | +@@ -1429,6 +1425,7 @@ slave-transaction-retries 10 |
113 | 113 | slave-type-conversions
|
114 | 114 | slow-launch-time 2
|
115 | 115 | slow-query-log FALSE
|
116 | 116 | +slow-start-timeout 15000
|
117 | 117 | sort-buffer-size 2097152
|
118 | 118 | sql-mode NO_AUTO_CREATE_USER,NO_ENGINE_SUBSTITUTION
|
119 | 119 | stack-trace TRUE
|
120 |
| -@@ -1438,15 +1435,13 @@ |
121 |
| - sync-relay-log 10000 |
122 |
| - sync-relay-log-info 10000 |
123 |
| - sysdate-is-now FALSE |
124 |
| --table-cache 421 |
125 |
| -+table-cache 2000 |
| 120 | +@@ -1444,10 +1441,8 @@ sysdate-is-now FALSE |
126 | 121 | table-definition-cache 400
|
127 |
| --table-open-cache 421 |
128 |
| -+table-open-cache 2000 |
129 | 122 | tc-heuristic-recover OFF
|
130 | 123 | thread-cache-size 0
|
131 | 124 | -thread-pool-idle-timeout 60
|
|
0 commit comments