Merge

1 files changed, 28 insertions, 70 deletions

diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
index d6236de2389..e51e0ed76b5 100644
--- a/mysql-test/r/mysqld--help-win.result
+++ b/mysql-test/r/mysqld--help-win.result
@@ -1,8 +1,8 @@
 The following options may be given as the first argument:
---print-defaults	Print the program argument list and exit
---no-defaults		Don't read default options from any options file
---defaults-file=#	Only read default options from the given file #
---defaults-extra-file=# Read this file after the global files are read
+--print-defaults Print the program argument list and exit.
+--no-defaults Don't read default options from any option file.
+--defaults-file=# Only read default options from the given file #.
+--defaults-extra-file=# Read this file after the global files are read.
 
  --abort-slave-event-count=# 
  Option used by mysql-test for debugging and testing of
@@ -60,7 +60,7 @@ The following options may be given as the first argument:
  NDBCLUSTER table
  --binlog-ignore-db=name 
  Tells the master that updates to the given database
- should not be logged tothe binary log.
+ should not be logged to the binary log.
  --binlog-row-event-max-size=# 
  The maximum size of a row-based binary log event in
  bytes. Rows will be grouped into events smaller than this
@@ -90,19 +90,13 @@ The following options may be given as the first argument:
  NEVER, AUTO, ALWAYS
  --connect-timeout=# The number of seconds the mysqld server is waiting for a
  connect packet before responding with 'Bad handshake'
- --console           Write error output on screen; Don't remove the console
+ --console           Write error output on screen; don't remove the console
  window on windows.
  --core-file         Write core on errors.
  -h, --datadir=name  Path to the database root directory
  --date-format=name  The DATE format (ignored)
  --datetime-format=name 
  The DATETIME format (ignored)
- -C, --default-character-set=name 
- Set the default character set (deprecated option, use
- --character-set-server instead).
- --default-collation=name 
- Set the default collation (deprecated option, use
- --collation-server instead).
  --default-storage-engine=name 
  The default storage engine for new tables
  --default-time-zone=name 
@@ -111,10 +105,6 @@ The following options may be given as the first argument:
  The default week format used by WEEK() functions
  --delay-key-write[=name] 
  Type of DELAY_KEY_WRITE
- --delay-key-write-for-all-tables 
- Don't flush key buffers between writes for any MyISAM
- table (Deprecated option, use --delay-key-write=all
- instead).
  --delayed-insert-limit=# 
  After inserting delayed_insert_limit rows, the INSERT
  DELAYED handler will check if there are any SELECT
@@ -134,7 +124,6 @@ The following options may be given as the first argument:
  --div-precision-increment=# 
  Precision of the result of '/' operator will be increased
  on that value
- --enable-locking    Deprecated option, use --external-locking instead.
  --engine-condition-pushdown 
  Push supported query conditions to the storage engine.
  Deprecated, use --optimizer-switch instead.
@@ -143,7 +132,7 @@ The following options may be given as the first argument:
  Enable the event scheduler. Possible values are ON, OFF,
  and DISABLED (keep the event scheduler completely
  deactivated, it cannot be activated run-time)
- -T, --exit-info[=#] Used for debugging;  Use at your own risk!
+ -T, --exit-info[=#] Used for debugging. Use at your own risk.
  --expire-logs-days=# 
  If non-zero, binary logs will be purged after
  expire_logs_days days; possible purges happen at startup
@@ -168,7 +157,7 @@ The following options may be given as the first argument:
  Number of best matches to use for query expansion
  --ft-stopword-file=name 
  Use stopwords from this file instead of built-in list
- --gdb               Set up signals usable for debugging
+ --gdb               Set up signals usable for debugging.
  --general-log       Log connections and queries to a table or log file.
  Defaults logging to a file hostname.log or a table
  mysql.general_logif --log-output=TABLE is used
@@ -218,6 +207,9 @@ The following options may be given as the first argument:
  the week.
  --local-infile      Enable LOAD DATA LOCAL INFILE
  (Defaults to on; use --skip-local-infile to disable.)
+ --lock-wait-timeout=# 
+ Timeout in seconds to wait for a lock before returning an
+ error.
  -l, --log[=name]    Log connections and queries to file (deprecated option,
  use --general-log/--general-log-file instead).
  --log-bin[=name]    Log update queries in binary format. Optional (but
@@ -237,10 +229,6 @@ The following options may be given as the first argument:
  can safely set this to TRUE
  --log-error[=name]  Error log file
  --log-isam[=name]   Log all MyISAM changes to file.
- -0, --log-long-format 
- Log some extra information to update log. Please note
- that this option is deprecated; see --log-short-format
- option.
  --log-output=name   Syntax: log-output=value[,value...], where "value" could
  be TABLE, FILE or NONE
  --log-queries-not-using-indexes 
@@ -265,11 +253,8 @@ The following options may be given as the first argument:
  log if it is open.
  --log-tc=name       Path to transaction coordinator log (used for
  transactions that affect more than one storage engine,
- when binary log is disabled)
+ when binary log is disabled).
  --log-tc-size=#     Size of transaction coordinator log.
- --log-update[=name] The update log is deprecated since version 5.0, is
- replaced by the binary log and this option justs turns on
- --log-bin instead.
  -W, --log-warnings[=#] 
  Log some not critical warnings to the log file
  --long-query-time=# Log all queries that have taken more than long_query_time
@@ -387,10 +372,11 @@ The following options may be given as the first argument:
  --old-passwords     Use old password encryption method (needed for 4.0 and
  older clients)
  --old-style-user-limits 
- Enable old-style user limits (before 5.0.3 user resources
- were counted per each user+host vs. per account)
- --one-thread        (deprecated): Only use one thread (for debugging under
- Linux). Use thread-handling=no-threads instead
+ Enable old-style user limits (before 5.0.3, user
+ resources were counted per each user+host vs. per
+ account).
+ --one-thread        (Deprecated): Only use one thread (for debugging under
+ Linux). Use thread-handling=no-threads instead.
  --open-files-limit=# 
  If this is not 0, then mysqld will use this value to
  reserve file descriptors to use with setrlimit(). If this
@@ -411,8 +397,9 @@ The following options may be given as the first argument:
  relation result in faster optimization, but may produce
  very bad query plans. If set to 0, the system will
  automatically pick a reasonable value; if set to 63, the
- optimizer will switch to the original find_best
- search(used for testing/comparison)
+ optimizer will switch to the original find_best search.
+ NOTE: The value 63 and its associated behaviour is
+ deprecated
  --optimizer-switch=name 
  optimizer_switch=option=val[,option=val...], where option
  is one of {index_merge, index_merge_union,
@@ -462,7 +449,7 @@ The following options may be given as the first argument:
  (3306), whatever comes first
  --port-open-timeout=# 
  Maximum time in seconds to wait for the port to become
- free. (Default: no wait)
+ free. (Default: No wait).
  --preload-buffer-size=# 
  The size of the buffer that is allocated when preloading
  indexes
@@ -497,9 +484,7 @@ The following options may be given as the first argument:
  the SUPER privilege
  --read-rnd-buffer-size=# 
  When reading rows in sorted order after a sort, the rows
- are read through this buffer to avoid a disk seeks. If
- not set, then it's set to the value of record_buffer
- --record-buffer=#   Deprecated; use --read-buffer-size instead.
+ are read through this buffer to avoid a disk seeks
  --relay-log=name    The location and name to use for relay logs
  --relay-log-index=name 
  The location and name to use for the file that keeps a
@@ -596,8 +581,6 @@ The following options may be given as the first argument:
  --rpl-recovery-rank=# 
  Unused, will be removed
  --safe-mode         Skip some optimize stages (for testing).
- --safe-show-database 
- Deprecated option; use GRANT SHOW DATABASES instead...
  --safe-user-create  Don't allow new user creation by the user who has no
  write privileges to the mysql.user table.
  --secure-auth       Disallow authentication for accounts that have old
@@ -607,29 +590,23 @@ The following options may be given as the first argument:
  files within specified directory
  --server-id=#       Uniquely identifies the server instance in the community
  of replication partners
- -O, --set-variable=name 
- Change the value of a variable. Please note that this
- option is deprecated;you can set variables directly with
- --variable-name=value.
  --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
+ Show user and password in SHOW SLAVE HOSTS on this
+ master.
  --skip-grant-tables Start without grant tables. This gives all users FULL
- ACCESS to all tables!
+ ACCESS to all tables.
  --skip-host-cache   Don't cache host names.
- --skip-locking      Deprecated option, use --skip-external-locking instead.
  --skip-name-resolve Don't resolve hostnames. All hostnames are IP's or
  'localhost'.
  --skip-networking   Don't allow connection with TCP/IP
- --skip-new          Don't use new, possible wrong routines.
+ --skip-new          Don't use new, possibly wrong routines.
  --skip-show-database 
  Don't allow 'SHOW DATABASE' commands
  --skip-slave-start  If set, slave is not autostarted.
  --skip-stack-trace  Don't print a stack trace on failure.
- --skip-symlink      Don't allow symlinking of tables. Deprecated option.  Use
- --skip-symbolic-links instead.
  --skip-thread-priority 
  Don't give threads different priorities. This option is
  deprecated because it has no effect; the implied behavior
@@ -681,10 +658,6 @@ The following options may be given as the first argument:
  --sporadic-binlog-dump-fail 
  Option used by mysql-test for debugging and testing of
  replication.
- --sql-bin-update-same 
- The update log is deprecated since version 5.0, is
- replaced by the binary log and this option does nothing
- anymore.
  --sql-mode=name     Syntax: sql-mode=mode[,mode[,mode...]]. See the manual
  for the complete list of valid sql modes
  --standalone        Dummy option to start as a standalone program (NT).
@@ -710,10 +683,6 @@ The following options may be given as the first argument:
  --table-cache=#     Deprecated; use --table-open-cache instead.
  --table-definition-cache=# 
  The number of cached table definitions
- --table-lock-wait-timeout=# 
- Timeout in seconds to wait for a table level lock before
- returning an error. Used only if the connection has
- active cursors
  --table-open-cache=# 
  The number of cached open tables
  --tc-heuristic-recover=name 
@@ -749,15 +718,11 @@ The following options may be given as the first argument:
  Prohibit update of a VIEW, which does not contain a key
  of the underlying table and the query uses a LIMIT clause
  (usually get from GUI tools)
- -s, --use-symbolic-links 
- Enable symbolic link support. Deprecated option; use
- --symbolic-links instead.
  -u, --user=name     Run mysqld daemon as user.
- -v, --verbose       Used with --help option for detailed help
+ -v, --verbose       Used with --help option for detailed help.
  -V, --version       Output version information and exit.
  --wait-timeout=#    The number of seconds the server waits for activity on a
  connection before closing it
- -W, --warnings[=#]  Deprecated; use --log-warnings instead.
 
 Variables (--variable-name=value)
 abort-slave-event-count 0
@@ -785,8 +750,6 @@ connect-timeout 10
 console FALSE
 date-format %Y-%m-%d
 datetime-format %Y-%m-%d %H:%i:%s
-default-character-set latin1
-default-collation latin1_swedish_ci
 default-storage-engine MyISAM
 default-time-zone (No default value)
 default-week-format 0
@@ -796,7 +759,6 @@ delayed-insert-timeout 300
 delayed-queue-size 1000
 disconnect-slave-event-count 0
 div-precision-increment 4
-enable-locking FALSE
 engine-condition-pushdown TRUE
 event-scheduler OFF
 expire-logs-days 0
@@ -829,6 +791,7 @@ lc-messages en_US
 lc-messages-dir MYSQL_SHAREDIR/
 lc-time-names en_US
 local-infile TRUE
+lock-wait-timeout 31536000
 log-bin (No default value)
 log-bin-index (No default value)
 log-bin-trust-function-creators FALSE
@@ -842,7 +805,6 @@ log-slow-admin-statements FALSE
 log-slow-slave-statements FALSE
 log-tc tc.log
 log-tc-size 24576
-log-update (No default value)
 log-warnings 1
 long-query-time 10
 low-priority-updates FALSE
@@ -925,7 +887,6 @@ range-alloc-block-size 4096
 read-buffer-size 131072
 read-only FALSE
 read-rnd-buffer-size 262144
-record-buffer 131072
 relay-log (No default value)
 relay-log-index (No default value)
 relay-log-info-file relay-log.info
@@ -970,7 +931,6 @@ sync-relay-log-info 0
 sysdate-is-now FALSE
 table-cache 400
 table-definition-cache 400
-table-lock-wait-timeout 50
 table-open-cache 400
 tc-heuristic-recover COMMIT
 thread-cache-size 0
@@ -983,10 +943,8 @@ transaction-alloc-block-size 8192
 transaction-isolation REPEATABLE-READ
 transaction-prealloc-size 4096
 updatable-views-with-limit YES
-use-symbolic-links FALSE
 verbose TRUE
 wait-timeout 28800
-warnings 1
 
 To see what values a running MySQL server is using, type
 'mysqladmin variables' instead of 'mysqld --verbose --help'.