summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorAlexander Nozdrin <alik@sun.com>2010-02-25 23:10:42 +0300
committerAlexander Nozdrin <alik@sun.com>2010-02-25 23:10:42 +0300
commit1db438506fad262d0a4a535c919a6ce8d78b28d3 (patch)
tree298877cf2279d9e4f433df97288ac7018c52fd33 /mysql-test
parent598cc412943c00d91c36eafb325fff887413607e (diff)
downloadmariadb-git-1db438506fad262d0a4a535c919a6ce8d78b28d3.tar.gz
Fix mysqld--help-notwin.result.
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/mysqld--help-win.result38
1 files changed, 20 insertions, 18 deletions
diff --git a/mysql-test/r/mysqld--help-win.result b/mysql-test/r/mysqld--help-win.result
index 15649cbc0fa..a9fc6df71a6 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,7 +90,7 @@ 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
@@ -132,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
@@ -157,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
@@ -253,7 +253,7 @@ 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.
-W, --log-warnings[=#]
Log some not critical warnings to the log file
@@ -372,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
@@ -447,7 +448,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
@@ -593,14 +594,15 @@ The following options may be given as the first argument:
--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-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.
@@ -720,7 +722,7 @@ The following options may be given as the first argument:
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