mirror of
https://github.com/MariaDB/server.git
synced 2025-01-19 05:22:25 +01:00
86c642056a
(and collateral changes) mysql-test/t/innodb_mysql_lock.test: change the variable from the test, not from the .opt file. one mysqld restart less. mysql-test/t/lowercase_table4.test: fix dos line endings sql/handler.cc: don't access the uninitialized variable
91 lines
3.2 KiB
Text
91 lines
3.2 KiB
Text
--- r/mysqld--help.result 2012-10-25 14:02:57.000000000 +0200
|
|
+++ mysqld--help,win.result~ 2012-10-30 11:37:08.000000000 +0100
|
|
@@ -244,7 +244,6 @@
|
|
The number of segments in a key cache
|
|
-L, --language=name Client error messages in given language. May be given as
|
|
a full path. Deprecated. Use --lc-messages-dir instead.
|
|
- --large-pages Enable support for large pages
|
|
--lc-messages=name Set the language used for the error messages.
|
|
-L, --lc-messages-dir=name
|
|
Directory where error messages are
|
|
@@ -437,6 +436,7 @@
|
|
NULLS_UNEQUAL (default behavior for 4.1 and later),
|
|
NULLS_EQUAL (emulate 4.0 behavior), and NULLS_IGNORED
|
|
--myisam-use-mmap Use memory mapping for reading and writing MyISAM tables
|
|
+ --named-pipe Enable the named pipe (NT)
|
|
--net-buffer-length=#
|
|
Buffer length for TCP/IP and socket communication
|
|
--net-read-timeout=#
|
|
@@ -774,6 +774,9 @@
|
|
files within specified directory
|
|
--server-id=# Uniquely identifies the server instance in the community
|
|
of replication partners
|
|
+ --shared-memory Enable the shared memory
|
|
+ --shared-memory-base-name=name
|
|
+ Base name of shared memory
|
|
--show-slave-auth-info
|
|
Show user and password in SHOW SLAVE HOSTS on this
|
|
master.
|
|
@@ -841,6 +844,10 @@
|
|
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).
|
|
--socket=name Socket file to use for connection
|
|
--sort-buffer-size=#
|
|
Each thread that needs to do a sort allocates a buffer of
|
|
@@ -849,6 +856,7 @@
|
|
for the complete list of valid sql modes
|
|
--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).
|
|
--stored-program-cache=#
|
|
The soft upper limit for number of cached stored routines
|
|
for one connection.
|
|
@@ -889,8 +897,8 @@
|
|
size, MySQL will automatically convert it to an on-disk
|
|
MyISAM or Aria 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
|
|
+ separated by a semicolon (;), in this case they are used
|
|
+ in a round-robin fashion
|
|
--transaction-alloc-block-size=#
|
|
Allocation block size for transactions to be stored in
|
|
binary log
|
|
@@ -993,7 +1001,6 @@
|
|
key-cache-block-size 1024
|
|
key-cache-division-limit 100
|
|
key-cache-segments 0
|
|
-large-pages FALSE
|
|
lc-messages en_US
|
|
lc-messages-dir MYSQL_SHAREDIR/
|
|
lc-time-names en_US
|
|
@@ -1056,6 +1063,7 @@
|
|
myisam-sort-buffer-size 8388608
|
|
myisam-stats-method nulls_unequal
|
|
myisam-use-mmap FALSE
|
|
+named-pipe FALSE
|
|
net-buffer-length 16384
|
|
net-read-timeout 30
|
|
net-retry-count 10
|
|
@@ -1148,6 +1156,8 @@
|
|
secure-auth FALSE
|
|
secure-file-priv (No default value)
|
|
server-id 0
|
|
+shared-memory FALSE
|
|
+shared-memory-base-name MYSQL
|
|
show-slave-auth-info FALSE
|
|
skip-grant-tables TRUE
|
|
skip-name-resolve FALSE
|
|
@@ -1164,6 +1174,7 @@
|
|
slave-type-conversions
|
|
slow-launch-time 2
|
|
slow-query-log FALSE
|
|
+slow-start-timeout 15000
|
|
sort-buffer-size 2097152
|
|
sql-mode
|
|
stack-trace TRUE
|