Bjorn Munch 5f2a76b
diff --git a/man/mysql.1 b/man/mysql.1
Bjorn Munch 5f2a76b
index 2e1602c..1e1d9f3 100644
Bjorn Munch 5f2a76b
--- a/man/mysql.1
Bjorn Munch 5f2a76b
+++ b/man/mysql.1
Bjorn Munch 5f2a76b
@@ -137,7 +137,8 @@ Section\ \&4.2.3.4, \(lqCommand-Line Options that Affect Option-File Handling\(r
a49d466
 .\" mysql: help option
a49d466
 .\" help option: mysql
a49d466
 \fB\-\-help\fR,
f477253
-\fB\-?\fR
f477253
+\fB\-?\fR,
f477253
+\fB\-I\fR
f477253
 .sp
f477253
 Display a help message and exit\&.
f477253
 .RE
Bjorn Munch 5f2a76b
@@ -348,6 +349,21 @@ Compress all information sent between the client and the server if both support
a49d466
 .ie n \{\
a49d466
 \h'-04'\(bu\h'+03'\c
f3c10fc
 .\}
f477253
+.\" mysql: connect-timeout option
f477253
+.\" connect-timeout option: mysql
f477253
+\fB\-\-connect\-timeout=\fR\fB\fIseconds\fR\fR
f3c10fc
+.sp
f477253
+Set the time for connection timeout in seconds\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 .el \{\
f3c10fc
 .sp -1
f3c10fc
 .IP \(bu 2.3
Bjorn Munch 5f2a76b
@@ -447,6 +463,37 @@ Section\ \&6.3.7, \(lqPluggable Authentication\(rq\&.
a49d466
 .sp
a49d466
 .RS 4
a49d466
 .ie n \{\
f477253
+.\" mysql: defaults-file option
f477253
+.\" defaults-file option: mysql
f477253
+\fB\-\-defaults-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f3c10fc
+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f477253
+.\" mysql: defaults-extra-file option
f477253
+.\" defaults-extra-file option: mysql
f477253
+\fB\-\-defaults-extra-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f477253
+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&.
f477253
+Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 \h'-04'\(bu\h'+03'\c
a49d466
 .\}
a49d466
 .el \{\
Bjorn Munch 5f2a76b
@@ -638,6 +685,36 @@ Section\ \&5.1.7, \(lqServer SQL Modes\(rq)\&.
a49d466
 .el \{\
f3c10fc
 .sp -1
f3c10fc
 .IP \(bu 2.3
f477253
+.\" mysql: max-allowed-packet option
f477253
+.\" max-allowed-packet option: mysql
f477253
+\fB\-\-max\-allowed\-packet=\fR\fB\fInum\fR\fR
f3c10fc
+.sp
f477253
+Specify the maximum packet length to send to or recieve form server\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f477253
+.\" mysql: max-join-size option
f477253
+.\" max-join-size option: mysql
f477253
+\fB\-\-max\-join\-size=\fR\fB\fInum\fR\fR
f3c10fc
+.sp
f477253
+Set the automatic limit for rows in a join when using \fB\-\-safe\-updates\fR\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f3c10fc
 .\}
a49d466
 .\" mysql: init-command option
a49d466
 .\" init-command option: mysql
Bjorn Munch 5f2a76b
@@ -691,6 +768,21 @@ has no effect if the server does not also support it\&.
a49d466
 .RS 4
a49d466
 .ie n \{\
a49d466
 \h'-04'\(bu\h'+03'\c
f477253
+.\" mysql: no-defaults option
f477253
+.\" no-defaults option: mysql
f477253
+\fB\-\-no\-defaults\fR
f3c10fc
+.sp
f477253
+Do not read default options from any option file\&. This must be given as the first argument\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f477253
 .\}
a49d466
 .el \{\
a49d466
 .sp -1
Bjorn Munch 5f2a76b
@@ -911,6 +1003,21 @@ the section called \(lqMYSQL COMMANDS\(rq, discusses output paging further\&.
a49d466
 \fB\-\-password[=\fR\fB\fIpassword\fR\fR\fB]\fR,
a49d466
 \fB\-p[\fR\fB\fIpassword\fR\fR\fB]\fR
a49d466
 .sp
f477253
+.\" mysql: print-defaults option
f477253
+.\" print-defaults option: mysql
f477253
+\fB\-\-print\-defaults\fR
f3c10fc
+.sp
f477253
+Print the program argument list and exit\&. This must be given as the first argument\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 The password to use when connecting to the server\&. If you use the short option form (\fB\-p\fR), you
a49d466
 \fIcannot\fR
a49d466
 have a space between the option and the password\&. If you omit the
Bjorn Munch 5f2a76b
@@ -1102,6 +1209,36 @@ If the connection to the server is lost, automatically try to reconnect\&. A sin
a49d466
 \fB\-\-skip\-reconnect\fR\&.
a49d466
 .RE
1d21d16
 .sp
f477253
+.\" mysql: select-limit option
f477253
+.\" select-limit option: mysql
f477253
+\fB\-\-select\-limit=\fR\fB\fIlimit\fR\fR
f3c10fc
+.sp
f477253
+Set automatic limit for SELECT when using \fB\-\-safe\-updates\fR\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f477253
+.\" mysql: server-arg option
f477253
+.\" server-arg option: mysql
f477253
+\fB\-\-server\-arg=\fR\fB\fIname\fR\fR
f3c10fc
+.sp
f477253
+Send \fB\fIname\fR\fR as a parameter to the embedded server\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 .RS 4
a49d466
 .ie n \{\
a49d466
 \h'-04'\(bu\h'+03'\c
Bjorn Munch 5f2a76b
@@ -1146,9 +1283,39 @@ to disable it\&.
a49d466
 .if n \{\
1d21d16
 .sp
f3c10fc
 .\}
a49d466
+.\" mysql: net-buffer-length option
a49d466
+.\" net-buffer-length option: mysql
a49d466
+\fB\-\-net\-buffer\-lenght=\fR\fB\fIsize\fR\fR
a49d466
+.sp
a49d466
+Set the buffer size for TCP/IP and socket communication\&.
a49d466
+.RE
a49d466
+.sp
a49d466
+.RS 4
a49d466
+.ie n \{\
a49d466
+\h'-04'\(bu\h'+03'\c
a49d466
+.\}
a49d466
+.el \{\
a49d466
+.sp -1
a49d466
+.IP \(bu 2.3
a49d466
+.\}
a49d466
 .RS 4
a49d466
 .it 1 an-trap
a49d466
 .nr an-no-space-flag 1
f477253
+.\" mysql: skip-auto-rehash option
f477253
+.\" skip-auto-rehash option: mysql
f477253
+\fB\-\-skip\-auto\-rehash\fR
f3c10fc
+.sp
f477253
+Disable automatic rehashing\&. Synonym for \fB\-\-disable\-auto\-rehash\fR\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 .nr an-break-flag 1
a49d466
 .br
a49d466
 .ps +1
Bjorn Munch 5f2a76b
@@ -1305,7 +1472,7 @@ localhost, the Unix socket file to use, or, on Windows, the name of the named pi
a49d466
 \fB\-\-ssl*\fR
f477253
 .sp
f477253
 Options that begin with
f477253
-\fB\-\-ssl\fR
f477253
+\fB\-\-ssl\fR,
f477253
 specify whether to connect to the server using SSL and indicate where to find SSL keys and certificates\&. See
Bjorn Munch 5f2a76b
 Section\ \&6.3.10.4, \(lqSSL Command Options\(rq\&.
f477253
 .RE
Bjorn Munch 5f2a76b
@@ -1481,7 +1648,7 @@ The XML output also uses an XML namespace, as shown here:
f477253
 .RS 4
f477253
 .\}
f477253
 .nf
f477253
-shell> \fBmysql \-\-xml \-uroot \-e "SHOW VARIABLES LIKE \*(Aqversion%\*(Aq"\fR
f477253
+shell> \fBmysql \-\-xml \-u root \-e "SHOW VARIABLES LIKE \*(Aqversion%\*(Aq"\fR
f477253
 
f477253
 <resultset statement="SHOW VARIABLES LIKE \*(Aqversion%\*(Aq" xmlns:xsi="http://www\&.w3\&.org/2001/XMLSchema\-instance">
f477253
 <row>
Bjorn Munch 5f2a76b
@@ -3395,16 +3562,16 @@ statements that probably need to examine more than 1,000,000 row combinations\&.
f3c10fc
 .RE
f477253
 .PP
f477253
 To specify limits different from 1,000 and 1,000,000, you can override the defaults by using the
f477253
-\fB\-\-select_limit\fR
f477253
+\fB\-\-select\-limit\fR
f477253
 and
f477253
-\fB\-\-max_join_size\fR
f477253
+\fB\-\-max\-join\-size\fR
f477253
 options:
f3c10fc
 .sp
f477253
 .if n \{\
f3c10fc
 .RS 4
f477253
 .\}
f477253
 .nf
f477253
-shell> \fBmysql \-\-safe\-updates \-\-select_limit=500 \-\-max_join_size=10000\fR
f477253
+shell> \fBmysql \-\-safe\-updates \-\-select\-limit=500 \-\-max\-join\-size=10000\fR
f477253
 .fi
f477253
 .if n \{\
f477253
 .RE
Bjorn Munch 5f2a76b
diff --git a/man/mysql_config.1 b/man/mysql_config.1
Bjorn Munch 5f2a76b
index 5bd4e5b..e7e11db 100644
Bjorn Munch 5f2a76b
--- a/man/mysql_config.1
Bjorn Munch 5f2a76b
+++ b/man/mysql_config.1
Bjorn Munch 5f2a76b
@@ -174,6 +174,22 @@ The default TCP/IP port number, defined when configuring MySQL\&.
Bjorn Munch 5f2a76b
 .sp
Bjorn Munch 5f2a76b
 .RS 4
Bjorn Munch 5f2a76b
 .ie n \{\
Bjorn Munch 5f2a76b
+.\" mysql_config: variable option
Bjorn Munch 5f2a76b
+.\" variable option: mysql_config
Bjorn Munch 5f2a76b
+\fB\-\-variable=VAR\fR
Bjorn Munch 5f2a76b
+.sp
Bjorn Munch 5f2a76b
+Path to MySQL include, library and plugin directories\&. \fBVAR\fR is one of
Bjorn Munch 5f2a76b
+`pkgincludedir`, `pkglibdir` and `plugindir`, respectively\&.
Bjorn Munch 5f2a76b
+.RE
Bjorn Munch 5f2a76b
+.sp
Bjorn Munch 5f2a76b
+.RS 4
Bjorn Munch 5f2a76b
+.ie n \{\
Bjorn Munch 5f2a76b
+\h'-04'\(bu\h'+03'\c
Bjorn Munch 5f2a76b
+.\}
Bjorn Munch 5f2a76b
+.el \{\
Bjorn Munch 5f2a76b
+.sp -1
Bjorn Munch 5f2a76b
+.IP \(bu 2.3
Bjorn Munch 5f2a76b
+.\}
Bjorn Munch 5f2a76b
 \h'-04'\(bu\h'+03'\c
Bjorn Munch 5f2a76b
 .\}
Bjorn Munch 5f2a76b
 .el \{\
Bjorn Munch 5f2a76b
diff --git a/man/mysqladmin.1 b/man/mysqladmin.1
Bjorn Munch 5f2a76b
index d1a1020..111715e 100644
Bjorn Munch 5f2a76b
--- a/man/mysqladmin.1
Bjorn Munch 5f2a76b
+++ b/man/mysqladmin.1
Bjorn Munch 5f2a76b
@@ -639,6 +639,21 @@ Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&.
f477253
 .sp -1
f477253
 .IP \(bu 2.3
f477253
 .\}
f477253
+.\" mysqladmin: connect-timeout option
f477253
+.\" connect-timeout option: mysqladmin
f477253
+\fB\-\-connect-timeout=\fR\fB\fItimeout\fR\fR
f477253
+.sp
f477253
+Equivalent to \fB\-\-connect_timeout\fR, see the end of this section\&.
f477253
+.RE
f477253
+.sp
f477253
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 .\" mysqladmin: compress option
a49d466
 .\" compress option: mysqladmin
a49d466
 \fB\-\-compress\fR,
Bjorn Munch 5f2a76b
@@ -729,6 +744,37 @@ Print debugging information and memory and CPU usage statistics when the program
1d21d16
 .sp
a49d466
 The client\-side authentication plugin to use\&. See
a49d466
 Section\ \&6.3.7, \(lqPluggable Authentication\(rq\&.
f477253
+.\" mysqladmin: defaults-extra-file option
f477253
+.\" defaults-extra-file option: mysqladmin
f3c10fc
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f3c10fc
+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&.
f3c10fc
+Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f477253
+.\" mysqladmin: defaults-file option
f477253
+.\" defaults-file option: mysqladmin
f3c10fc
+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f477253
+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&. Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 .RE
1d21d16
 .sp
a49d466
 .RS 4
Bjorn Munch 5f2a76b
@@ -789,6 +835,21 @@ command\&. With multiple commands, continue even if an error occurs\&.
a49d466
 .ie n \{\
a49d466
 \h'-04'\(bu\h'+03'\c
f3c10fc
 .\}
f477253
+.\" mysqladmin: no-defaults option
f477253
+.\" no-defaults option: mysqladmin
f3c10fc
+\fB\-\-no\-defaults\fR
f3c10fc
+.sp
f3c10fc
+Do not read default options from any option file\&. This must be given as the first argument\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 .el \{\
f477253
 .sp -1
f477253
 .IP \(bu 2.3
Bjorn Munch 5f2a76b
@@ -887,6 +948,21 @@ Section\ \&6.1.2.1, \(lqEnd-User Guidelines for Password Security\(rq\&. You can
a49d466
 On Windows, connect to the server using a named pipe\&. This option applies only if the server supports named\-pipe connections\&.
a49d466
 .RE
a49d466
 .sp
f477253
+.\" mysqladmin: print-defaults option
f477253
+.\" print-defaults option: mysqladmin
f477253
+\fB\-\-print\-defaults\fR
f477253
+.sp
f477253
+Print the program argument list and exit\&. This must be given as the first argument\&.
f477253
+.RE
f477253
+.sp
f477253
+.RS 4
f477253
+.ie n \{\
f477253
+\h'-04'\(bu\h'+03'\c
f477253
+.\}
f477253
+.el \{\
f477253
+.sp -1
f477253
+.IP \(bu 2.3
f477253
+.\}
a49d466
 .RS 4
a49d466
 .ie n \{\
a49d466
 \h'-04'\(bu\h'+03'\c
Bjorn Munch 5f2a76b
@@ -967,6 +1043,21 @@ command\&.
Bjorn Munch 5f2a76b
 .sp -1
Bjorn Munch 5f2a76b
 .IP \(bu 2.3
Bjorn Munch 5f2a76b
 .\}
f477253
+.\" mysqladmin: shutdown-timeout option
f477253
+.\" shutdown-timeout option: mysqladmin
f477253
+\fB\-\-shutdown\-timeout\fR\fB\fItimeout\fR\fR
f3c10fc
+.sp
f477253
+Equivalent of \fB\-\-shutdown_timeout\fR, see the end of this section\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f477253
+.ie n \{\
f477253
+\h'-04'\(bu\h'+03'\c
f477253
+.\}
f477253
+.el \{\
f477253
+.sp -1
f477253
+.IP \(bu 2.3
f477253
+.\}
Bjorn Munch 5f2a76b
 .\" mysqladmin: secure-auth option
Bjorn Munch 5f2a76b
 .\" secure-auth option: mysqladmin
Bjorn Munch 5f2a76b
 \fB\-\-secure\-auth\fR
Bjorn Munch 5f2a76b
diff --git a/man/mysqlbinlog.1 b/man/mysqlbinlog.1
Bjorn Munch 5f2a76b
index eead304..8e30383 100644
Bjorn Munch 5f2a76b
--- a/man/mysqlbinlog.1
Bjorn Munch 5f2a76b
+++ b/man/mysqlbinlog.1
Bjorn Munch 5f2a76b
@@ -629,6 +629,7 @@ Do not display any of the groups listed in the
Bjorn Munch 5f2a76b
 \fB\-F\fR
Bjorn Munch 5f2a76b
 .sp
Bjorn Munch 5f2a76b
 Read binary log files even if they are open or were not closed properly\&.
Bjorn Munch 5f2a76b
+Enabled by default, use \fB\-\-skip\-force\-if\-open\fR to disable\&.
Bjorn Munch 5f2a76b
 .RE
Bjorn Munch 5f2a76b
 .sp
Bjorn Munch 5f2a76b
 .RS 4
Bjorn Munch 5f2a76b
@@ -743,6 +744,22 @@ or any other MySQL program\&.
Bjorn Munch 5f2a76b
 .sp -1
Bjorn Munch 5f2a76b
 .IP \(bu 2.3
Bjorn Munch 5f2a76b
 .\}
f477253
+.\" mysqlbinlog: open-files-limit option
f477253
+.\" open-files-limit option: mysqlbinlog
f477253
+\fB\-\-open\-files\-limit=\fR\fB\fINUM\fR\fR
f477253
+.sp
f477253
+Sets the open_files_limit variable, which is used to reserve file descriptors for
f477253
+\fBmysqlbinlog\fR\&.
f477253
+.RE
f477253
+.sp
f477253
+.RS 4
Bjorn Munch 5f2a76b
+.ie n \{\
Bjorn Munch 5f2a76b
+\h'-04'\(bu\h'+03'\c
Bjorn Munch 5f2a76b
+.\}
Bjorn Munch 5f2a76b
+.el \{\
Bjorn Munch 5f2a76b
+.sp -1
Bjorn Munch 5f2a76b
+.IP \(bu 2.3
Bjorn Munch 5f2a76b
+.\}
Bjorn Munch 5f2a76b
 .\" mysqlbinlog: login-path option
Bjorn Munch 5f2a76b
 .\" login-path option: mysqlbinlog
Bjorn Munch 5f2a76b
 \fB\-\-login\-path=\fR\fB\fIname\fR\fR
Bjorn Munch 5f2a76b
diff --git a/man/mysqlcheck.1 b/man/mysqlcheck.1
Bjorn Munch 5f2a76b
index 8f1a6ce..2cddc1f 100644
Bjorn Munch 5f2a76b
--- a/man/mysqlcheck.1
Bjorn Munch 5f2a76b
+++ b/man/mysqlcheck.1
Bjorn Munch 5f2a76b
@@ -456,6 +456,38 @@ Print some debugging information when the program exits\&.
f3c10fc
 .IP \(bu 2.3
f3c10fc
 .\}
a49d466
 .\" mysqlcheck: debug-info option
f477253
+.\" mysqlcheck: defaults-extra-file option
f477253
+.\" defaults-extra-file option: mysqlcheck
f3c10fc
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f477253
+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&.
f477253
+Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f477253
+.\" mysqlcheck: defaults-file option
f477253
+.\" defaults-file option: mysqlcheck
f3c10fc
+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f3c10fc
+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&.
f3c10fc
+Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f477253
+.\}
f477253
+.el \{\
f477253
+.sp -1
f477253
+.IP \(bu 2.3
f477253
+.\}
a49d466
 .\" debug-info option: mysqlcheck
a49d466
 \fB\-\-debug\-info\fR
1d21d16
 .sp
Bjorn Munch 5f2a76b
@@ -572,6 +604,21 @@ Convert table names to 5\&.1 format\&. Only table names that contain special cha
f3c10fc
 .\}
a49d466
 .\" mysqlcheck: force option
a49d466
 .\" force option: mysqlcheck
f477253
+.\" mysqlcheck: no-defaults option
f477253
+.\" no-defaults option: mysqlcheck
f3c10fc
+\fB\-\-no\-defaults\fR
f3c10fc
+.sp
f477253
+Do not read default options from any option file\&. This must be given as the first argument\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 \fB\-\-force\fR,
a49d466
 \fB\-f\fR
1d21d16
 .sp
Bjorn Munch 5f2a76b
@@ -728,6 +775,22 @@ This option was added in MySQL 5\&.6\&.2\&.
Bjorn Munch 5f2a76b
 .sp -1
Bjorn Munch 5f2a76b
 .IP \(bu 2.3
Bjorn Munch 5f2a76b
 .\}
f477253
+.\" mysqlcheck: print-defaults option
f477253
+.\" print-defaults option: mysqlcheck
f3c10fc
+\fB\-\-print\-defaults\fR
f3c10fc
+.sp
f3c10fc
+Print the program argument list and exit\&.
f3c10fc
+This must be given as the first argument\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
Bjorn Munch 5f2a76b
 .\" mysqlcheck: port option
Bjorn Munch 5f2a76b
 .\" port option: mysqlcheck
Bjorn Munch 5f2a76b
 \fB\-\-port=\fR\fB\fIport_num\fR\fR,
Bjorn Munch 5f2a76b
diff --git a/man/mysqldump.1 b/man/mysqldump.1
Bjorn Munch 5f2a76b
index 9f5dad4..d92f4e6 100644
Bjorn Munch 5f2a76b
--- a/man/mysqldump.1
Bjorn Munch 5f2a76b
+++ b/man/mysqldump.1
Bjorn Munch 5f2a76b
@@ -1304,7 +1304,7 @@ statements that include column names\&.
a49d466
 .\}
a49d466
 .\" mysqldump: create-options option
a49d466
 .\" create-options option: mysqldump
a49d466
-\fB\-\-create\-options\fR
a49d466
+\fB\-\-create\-options\fR, \fB\-a\fR
f477253
 .sp
f477253
 Include all MySQL\-specific table options in the
f477253
 CREATE TABLE
Bjorn Munch 5f2a76b
@@ -1724,6 +1724,38 @@ Do not dump the given table, which must be specified using both the database and
a49d466
 \fB\-d\fR
a49d466
 .sp
a49d466
 Do not write any table row information (that is, do not dump table contents)\&. This is useful if you want to dump only the
f477253
+.\" mysqldump: defaults-extra-file option
f477253
+.\" defaults-extra-file option: mysqldump
f477253
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f477253
+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been read\&.
f477253
+Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f477253
+.\" mysqldump: defaults-file option
f477253
+.\" defaults-file option: mysqldump
f477253
+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f477253
+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&.
f3c10fc
+Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 CREATE TABLE
a49d466
 statement for the table (for example, to create an empty copy of the table by loading the dump file)\&.
a49d466
 .RE
Bjorn Munch 5f2a76b
@@ -1975,6 +2007,36 @@ for information about selectively enabling or disabling a subset of the options
f3c10fc
 .IP \(bu 2.3
f3c10fc
 .\}
a49d466
 .\" mysqldump: quick option
f477253
+.\" mysqldump: max-allowed-packet option
f477253
+.\" max-allowed-packet option: mysqldump
f477253
+\fB\-\-max\-allowed\-packet=\fR\fB\fIlength\fR\fR
f3c10fc
+.sp
f477253
+Sets the maximum packet length to send to or recieve from server\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f477253
+.\" mysqldump: net-buffer-length option
f477253
+.\" net-buffer-length option: mysqldump
f477253
+\fB\-\-net\-buffer\-length=\fR\fB\fIlength\fR\fR
f3c10fc
+.sp
f477253
+Sets the buffer size for TCP/IP and socket communication\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 .\" quick option: mysqldump
a49d466
 \fB\-\-quick\fR,
a49d466
 \fB\-q\fR
Bjorn Munch 5f2a76b
@@ -2252,6 +2314,21 @@ is on by default\&. Thus you rarely if ever specify
f477253
 .el \{\
f3c10fc
 .sp -1
f3c10fc
 .IP \(bu 2.3
f477253
+.\" mysqldump: no-defaults option
f477253
+.\" no-defaults option: mysqldump
f477253
+\fB\-\-no\-defaults\fR
f3c10fc
+.sp
f477253
+Do not read default options from any option file\&. This must be given as the first argument\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f477253
 .\}
f477253
 The
f477253
 \fB\-\-compact\fR
Bjorn Munch 5f2a76b
@@ -2436,6 +2513,21 @@ is on by default\&.)
Bjorn Munch 5f2a76b
 .sp -1
Bjorn Munch 5f2a76b
 .IP \(bu 2.3
Bjorn Munch 5f2a76b
 .\}
f477253
+.\" mysqldump: print-defaults option
f477253
+.\" print-defaults option: mysqldump
f3c10fc
+\fB\-\-print\-defaults\fR
f3c10fc
+.sp
f477253
+Print the program argument list and exit\&. This must begiven as the first argument\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
Bjorn Munch 5f2a76b
+.ie n \{\
Bjorn Munch 5f2a76b
+\h'-04'\(bu\h'+03'\c
Bjorn Munch 5f2a76b
+.\}
Bjorn Munch 5f2a76b
+.el \{\
Bjorn Munch 5f2a76b
+.sp -1
Bjorn Munch 5f2a76b
+.IP \(bu 2.3
Bjorn Munch 5f2a76b
+.\}
Bjorn Munch 5f2a76b
 To reverse
Bjorn Munch 5f2a76b
 \fB\-\-opt\fR
Bjorn Munch 5f2a76b
 for all features except index disabling and table locking, use
Bjorn Munch 5f2a76b
diff --git a/man/mysqlimport.1 b/man/mysqlimport.1
Bjorn Munch 5f2a76b
index 9d82dab..1d231d3 100644
Bjorn Munch 5f2a76b
--- a/man/mysqlimport.1
Bjorn Munch 5f2a76b
+++ b/man/mysqlimport.1
Bjorn Munch 5f2a76b
@@ -258,10 +258,42 @@ This option was added in MySQL 5\&.6\&.2\&.
f3c10fc
 .sp -1
f3c10fc
 .IP \(bu 2.3
f3c10fc
 .\}
f477253
+.\" mysqlimport: defaults-extra-file option
f477253
+.\" defaults-extra-file option: mysqlimport
f477253
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f477253
+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been
f477253
+read\&.  Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f477253
+.\" mysqlimport: defaults-file option
f477253
+.\" defaults-file option: mysqlimport
f477253
+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f477253
+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&.
f477253
+Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 .\" mysqlimport: delete option
a49d466
 .\" delete option: mysqlimport
a49d466
 \fB\-\-delete\fR,
f477253
-\fB\-D\fR
f477253
+\fB\-d\fR
f477253
 .sp
f477253
 Empty the table before importing the text file\&.
f477253
 .RE
Bjorn Munch 5f2a76b
@@ -397,6 +429,22 @@ Section\ \&13.2.6, \(lqLOAD DATA INFILE Syntax\(rq\&.
a49d466
 Read input files locally from the client host\&.
a49d466
 .RE
a49d466
 .sp
f477253
+.\" mysqlimport: no-defaults option
f477253
+.\" no-defaults option: mysqlimport
f477253
+\fB\-\-no\-defaults\fR
f3c10fc
+.sp
f477253
+Do not read default options from any option file\&. This must be given as the
f477253
+first argument\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 .RS 4
a49d466
 .ie n \{\
a49d466
 \h'-04'\(bu\h'+03'\c
Bjorn Munch 5f2a76b
@@ -535,6 +583,22 @@ This option was added in MySQL 5\&.6\&.2\&.
Bjorn Munch 5f2a76b
 .sp -1
Bjorn Munch 5f2a76b
 .IP \(bu 2.3
Bjorn Munch 5f2a76b
 .\}
f477253
+.\" mysqlimport: print-defaults option
f477253
+.\" print-defaults option: mysqlimport
f477253
+\fB\-\-print\-defaults\fR
f477253
+.sp
f477253
+Print the program argument list and exit\&.
f477253
+This must be given as the first argument\&.
f477253
+.RE
f477253
+.sp
f477253
+.RS 4
Bjorn Munch 5f2a76b
+.ie n \{\
Bjorn Munch 5f2a76b
+\h'-04'\(bu\h'+03'\c
Bjorn Munch 5f2a76b
+.\}
Bjorn Munch 5f2a76b
+.el \{\
Bjorn Munch 5f2a76b
+.sp -1
Bjorn Munch 5f2a76b
+.IP \(bu 2.3
Bjorn Munch 5f2a76b
+.\}
Bjorn Munch 5f2a76b
 .\" mysqlimport: port option
Bjorn Munch 5f2a76b
 .\" port option: mysqlimport
Bjorn Munch 5f2a76b
 \fB\-\-port=\fR\fB\fIport_num\fR\fR,
Bjorn Munch 5f2a76b
diff --git a/man/mysqlshow.1 b/man/mysqlshow.1
Bjorn Munch 5f2a76b
index 0634515..0cfbfd3 100644
Bjorn Munch 5f2a76b
--- a/man/mysqlshow.1
Bjorn Munch 5f2a76b
+++ b/man/mysqlshow.1
Bjorn Munch 5f2a76b
@@ -173,7 +173,7 @@ This option is supported beginning with MySQL 5\&.6\&.1\&.
f3c10fc
 .\}
a49d466
 .\" mysqlshow: character-sets-dir option
a49d466
 .\" character-sets-dir option: mysqlshow
a49d466
-\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
a49d466
+\fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR, \fB\-c\fR
f3c10fc
 .sp
f3c10fc
 The directory where character sets are installed\&. See
f3c10fc
 Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&.
Bjorn Munch 5f2a76b
@@ -285,6 +285,38 @@ Section\ \&10.5, \(lqCharacter Set Configuration\(rq\&.
f3c10fc
 .\}
a49d466
 .el \{\
a49d466
 .sp -1
f3c10fc
+.\" mysqlshow: defaults-extra-file option
f3c10fc
+.\" defaults-extra-file option: mysqlshow
f3c10fc
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f3c10fc
+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been
f3c10fc
+read\&.  Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f3c10fc
+.\" mysqlshow: defaults-file option
f3c10fc
+.\" defaults-file option: mysqlshow
f3c10fc
+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f3c10fc
+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&.
f3c10fc
+Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f3c10fc
 .IP \(bu 2.3
f3c10fc
 .\}
a49d466
 .\" mysqlshow: default-auth option
Bjorn Munch 5f2a76b
@@ -313,6 +345,22 @@ This option was added in MySQL 5\&.6\&.2\&.
a49d466
 Connect to the MySQL server on the given host\&.
a49d466
 .RE
a49d466
 .sp
f3c10fc
+.\" mysqlshow: no-defaults option
f3c10fc
+.\" no-defaults option: mysqlshow
f3c10fc
+\fB\-\-no\-defaults\fR
f3c10fc
+.sp
f3c10fc
+Do not read default options from any option file\&. This must be given as the
f3c10fc
+first argument\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 .RS 4
a49d466
 .ie n \{\
a49d466
 \h'-04'\(bu\h'+03'\c
Bjorn Munch 5f2a76b
@@ -429,6 +477,22 @@ This option was added in MySQL 5\&.6\&.2\&.
Bjorn Munch 5f2a76b
 .sp -1
Bjorn Munch 5f2a76b
 .IP \(bu 2.3
Bjorn Munch 5f2a76b
 .\}
f3c10fc
+.\" mysqlshow: print-defaults option
f3c10fc
+.\" print-defaults option: mysqlshow
f3c10fc
+\fB\-\-print\-defaults\fR
f3c10fc
+.sp
f3c10fc
+Print the program argument list and exit\&.
f3c10fc
+This must be given as the first argument\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
Bjorn Munch 5f2a76b
+.ie n \{\
Bjorn Munch 5f2a76b
+\h'-04'\(bu\h'+03'\c
Bjorn Munch 5f2a76b
+.\}
Bjorn Munch 5f2a76b
+.el \{\
Bjorn Munch 5f2a76b
+.sp -1
Bjorn Munch 5f2a76b
+.IP \(bu 2.3
Bjorn Munch 5f2a76b
+.\}
Bjorn Munch 5f2a76b
 .\" mysqlshow: port option
Bjorn Munch 5f2a76b
 .\" port option: mysqlshow
Bjorn Munch 5f2a76b
 \fB\-\-port=\fR\fB\fIport_num\fR\fR,
Bjorn Munch 5f2a76b
diff --git a/man/mysqlslap.1 b/man/mysqlslap.1
Bjorn Munch 5f2a76b
index 7c4d4e7..85a5168 100644
Bjorn Munch 5f2a76b
--- a/man/mysqlslap.1
Bjorn Munch 5f2a76b
+++ b/man/mysqlslap.1
Bjorn Munch 5f2a76b
@@ -526,6 +526,38 @@ This option was added in MySQL 5\&.6\&.2\&.
f3c10fc
 .el \{\
f3c10fc
 .sp -1
f3c10fc
 .IP \(bu 2.3
f3c10fc
+.\" mysqlslap: defaults-extra-file option
f3c10fc
+.\" defaults-extra-file option: mysqlslap
f3c10fc
+\fB\-\-defaults\-extra\-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f3c10fc
+Set \fB\fIfilename\fR\fR as the file to read default options from after the global defaults files has been
f3c10fc
+read\&.  Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f3c10fc
+.\" mysqlslap: defaults-file option
f3c10fc
+.\" defaults-file option: mysqlslap
f3c10fc
+\fB\-\-defaults\-file=\fR\fB\fIfilename\fR\fR
f3c10fc
+.sp
f3c10fc
+Set \fB\fIfilename\fR\fR as the file to read default options from, override global defaults files\&.
f3c10fc
+Must be given as first option\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f3c10fc
 .\}
a49d466
 .\" mysqlslap: delimiter option
a49d466
 .\" delimiter option: mysqlslap
Bjorn Munch 5f2a76b
@@ -584,6 +616,37 @@ Section\ \&6.3.8.7, \(lqThe Cleartext Client-Side Authentication Plugin\(rq\&.)
1d21d16
 \fB\-e \fR\fB\fIengine_name\fR\fR
a49d466
 .sp
a49d466
 The storage engine to use for creating tables\&.
f3c10fc
+.\" mysqlslap: no-defaults option
f3c10fc
+.\" no-defaults option: mysqlslap
f3c10fc
+\fB\-\-no\-defaults\fR
f3c10fc
+.sp
f3c10fc
+Do not read default options from any option file\&. This must be given as the
f3c10fc
+first argument\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
f3c10fc
+.\" mysqlslap: no-drop option
f3c10fc
+.\" no-drop option: mysqlslap
f3c10fc
+\fB\-\-no\-drop\fR
f3c10fc
+.sp
f3c10fc
+Do not drop the schema after the test\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
f3c10fc
+.ie n \{\
f3c10fc
+\h'-04'\(bu\h'+03'\c
f3c10fc
+.\}
f3c10fc
+.el \{\
f3c10fc
+.sp -1
f3c10fc
+.IP \(bu 2.3
f3c10fc
+.\}
a49d466
 .RE
1d21d16
 .sp
a49d466
 .RS 4
Bjorn Munch 5f2a76b
@@ -822,6 +885,22 @@ This option was added in MySQL 5\&.6\&.2\&.
Bjorn Munch 5f2a76b
 .sp -1
Bjorn Munch 5f2a76b
 .IP \(bu 2.3
Bjorn Munch 5f2a76b
 .\}
f3c10fc
+.\" mysqlslap: print-defaults option
f3c10fc
+.\" print-defaults option: mysqlslap
f3c10fc
+\fB\-\-print\-defaults\fR
f3c10fc
+.sp
f3c10fc
+Print the program argument list and exit\&.
f3c10fc
+This must be given as the first argument\&.
f3c10fc
+.RE
f3c10fc
+.sp
f3c10fc
+.RS 4
Bjorn Munch 5f2a76b
+.ie n \{\
Bjorn Munch 5f2a76b
+\h'-04'\(bu\h'+03'\c
Bjorn Munch 5f2a76b
+.\}
Bjorn Munch 5f2a76b
+.el \{\
Bjorn Munch 5f2a76b
+.sp -1
Bjorn Munch 5f2a76b
+.IP \(bu 2.3
Bjorn Munch 5f2a76b
+.\}
Bjorn Munch 5f2a76b
 .\" mysqlslap: port option
Bjorn Munch 5f2a76b
 .\" port option: mysqlslap
Bjorn Munch 5f2a76b
 \fB\-\-port=\fR\fB\fIport_num\fR\fR,