summaryrefslogtreecommitdiff
path: root/mysql-test/r/mysqld--help,win.rdiff
blob: 0fa6e41391f2c53e2ff96ad8b89c9f8c307e47a9 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
--- 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