update the r/mysqld--help,win.rdiff to match the updated r/mysqld--help.result

1 files changed, 14 insertions, 13 deletions

diff --git a/mysql-test/r/mysqld--help,win.rdiff b/mysql-test/r/mysqld--help,win.rdiff
index 957292b265f..cd39445f3e6 100644
--- a/mysql-test/r/mysqld--help,win.rdiff
+++ b/mysql-test/r/mysqld--help,win.rdiff
@@ -1,6 +1,6 @@
---- r/mysqld--help.result	2012-01-13 16:50:49.000000000 +0100
-+++ r/mysqld--help-win.result	2012-01-19 14:12:00.000000000 +0100
-@@ -240,7 +240,6 @@
+--- mysql-test/r/mysqld--help.result	2012-09-08 22:22:06 +0000
++++ mysql-test/r/mysqld--help.result	2012-10-01 14:03:59 +0000
+@@ -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.
@@ -8,7 +8,7 @@
   --lc-messages=name  Set the language used for the error messages.
   -L, --lc-messages-dir=name 
   Directory where error messages are
-@@ -436,6 +435,7 @@
+@@ -440,6 +439,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
@@ -16,7 +16,7 @@
   --net-buffer-length=# 
   Buffer length for TCP/IP and socket communication
   --net-read-timeout=# 
-@@ -695,6 +695,9 @@
+@@ -707,6 +707,9 @@
   files within specified directory
   --server-id=#       Uniquely identifies the server instance in the community
   of replication partners
@@ -26,7 +26,7 @@
   --show-slave-auth-info 
   Show user and password in SHOW SLAVE HOSTS on this
   master.
-@@ -759,6 +762,10 @@
+@@ -774,6 +777,10 @@
   Log slow queries to given log file. Defaults logging to
   'hostname'-slow.log. Must be enabled to activate other
   slow log options
@@ -37,7 +37,7 @@
   --socket=name       Socket file to use for connection
   --sort-buffer-size=# 
   Each thread that needs to do a sort allocates a buffer of
-@@ -767,6 +774,7 @@
+@@ -782,6 +789,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.)
@@ -45,7 +45,7 @@
   --stored-program-cache=# 
   The soft upper limit for number of cached stored routines
   for one connection.
-@@ -807,8 +815,8 @@
+@@ -822,8 +830,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,
@@ -56,15 +56,15 @@
   --transaction-alloc-block-size=# 
   Allocation block size for transactions to be stored in
   binary log
-@@ -908,7 +916,6 @@
+@@ -923,7 +931,6 @@ key-cache-age-threshold 300
+ key-cache-block-size 1024
  key-cache-division-limit 100
  key-cache-segments 0
- language MYSQL_SHAREDIR/
 -large-pages FALSE
  lc-messages en_US
  lc-messages-dir MYSQL_SHAREDIR/
  lc-time-names en_US
-@@ -971,6 +978,7 @@
+@@ -986,6 +993,7 @@ myisam-repair-threads 1
  myisam-sort-buffer-size 8388608
  myisam-stats-method nulls_unequal
  myisam-use-mmap FALSE
@@ -72,7 +72,7 @@
  net-buffer-length 16384
  net-read-timeout 30
  net-retry-count 10
-@@ -1035,6 +1043,8 @@
+@@ -1051,6 +1059,8 @@ safe-user-create FALSE
  secure-auth FALSE
  secure-file-priv (No default value)
  server-id 0
@@ -81,7 +81,7 @@
  show-slave-auth-info FALSE
  skip-grant-tables TRUE
  skip-name-resolve FALSE
-@@ -1050,6 +1060,7 @@
+@@ -1067,6 +1077,7 @@ slave-transaction-retries 10
  slave-type-conversions 
  slow-launch-time 2
  slow-query-log FALSE
@@ -89,3 +89,4 @@
  sort-buffer-size 2097152
  sql-mode 
  stack-trace TRUE
+