Commit e19ca691 authored by Sergei Petrunia's avatar Sergei Petrunia

Update test results, mysql-test/r/mysqld--help,win.rdiff

parent dd31e5c6
...@@ -17,15 +17,15 @@ ...@@ -17,15 +17,15 @@
Buffer length for TCP/IP and socket communication Buffer length for TCP/IP and socket communication
--net-read-timeout=# --net-read-timeout=#
@@ -903,6 +903,9 @@ @@ -903,6 +903,9 @@
files within specified directory characteristics (isolation level, read only/read
--server-id=# Uniquely identifies the server instance in the community write,snapshot - but not any work done / data modified
of replication partners within the transaction).
+ --shared-memory Enable the shared memory + --shared-memory Enable the shared memory
+ --shared-memory-base-name=name + --shared-memory-base-name=name
+ Base name of shared memory + Base name of shared memory
--session-track-schema --show-slave-auth-info
Track changes to the default schema. Show user and password in SHOW SLAVE HOSTS on this
(Defaults to on; use --skip-session-track-schema to disable.) master.
@@ -1015,6 +1018,10 @@ @@ -1015,6 +1018,10 @@
Log slow queries to given log file. Defaults logging to Log slow queries to given log file. Defaults logging to
'hostname'-slow.log. Must be enabled to activate other 'hostname'-slow.log. Must be enabled to activate other
...@@ -101,14 +101,14 @@ ...@@ -101,14 +101,14 @@
net-read-timeout 30 net-read-timeout 30
net-retry-count 10 net-retry-count 10
@@ -1387,6 +1381,8 @@ @@ -1387,6 +1381,8 @@
secure-auth TRUE
secure-file-priv (No default value)
server-id 1
+shared-memory FALSE
+shared-memory-base-name MYSQL
session-track-schema TRUE
session-track-state-change FALSE session-track-state-change FALSE
session-track-system-variables session-track-system-variables
session-track-transaction-info OFF
+shared-memory FALSE
+shared-memory-base-name MYSQL
show-slave-auth-info FALSE
silent-startup FALSE
skip-grant-tables TRUE
@@ -1411,6 +1407,7 @@ @@ -1411,6 +1407,7 @@
slave-type-conversions slave-type-conversions
slow-launch-time 2 slow-launch-time 2
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment