MDEV-7680: Update man pages

1 files changed, 448 insertions, 148 deletions

diff --git a/man/mysqldump.1 b/man/mysqldump.1
index fdca51f091a..da2e4fa02c5 100644
--- a/man/mysqldump.1
+++ b/man/mysqldump.1
@@ -1,13 +1,6 @@
 '\" t
-.\"     Title: \fBmysqldump\fR
-.\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
-.\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 04/06/2010
-.\"    Manual: MySQL Database System
-.\"    Source: MySQL 5.1
-.\"  Language: English
 .\"
-.TH "\FBMYSQLDUMP\FR" "1" "04/06/2010" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLDUMP\FR" "1" "04/08/2015" "MariaDB 10\&.0" "MariaDB Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -32,7 +25,7 @@ mysqldump \- a database backup program
 .PP
 The
 \fBmysqldump\fR
-client is a backup program originally written by Igor Romanenko\&. It can be used to dump a database or a collection of databases for backup or transfer to another SQL server (not necessarily a MySQL server)\&. The dump typically contains SQL statements to create the table, populate it, or both\&. However,
+client is a backup program originally written by Igor Romanenko\&. It can be used to dump a database or a collection of databases for backup or transfer to another SQL server (not necessarily a MariaDB server)\&. The dump typically contains SQL statements to create the table, populate it, or both\&. However,
 \fBmysqldump\fR
 can also be used to generate files in CSV, other delimited text, or XML format\&.
 .PP
@@ -68,18 +61,11 @@ option, entire databases are dumped\&.
 .PP
 \fBmysqldump\fR
 does not dump the
-INFORMATION_SCHEMA
-database by default\&. As of MySQL 5\&.1\&.38,
-\fBmysqldump\fR
-dumps
-INFORMATION_SCHEMA
-if you name it explicitly on the command line, although currently you must also use the
+INFORMATION_SCHEMA or performance_schema
+databases by default\&. To dump these, 
+name them explicitly on the command line, although you must also use the
 \fB\-\-skip\-lock\-tables\fR
-option\&. Before 5\&.1\&.38,
-\fBmysqldump\fR
-silently ignores
-INFORMATION_SCHEMA
-even if you name it explicitly on the command line\&.
+option\&.
 .PP
 To see a list of the options your version of
 \fBmysqldump\fR
@@ -207,22 +193,6 @@ or
 option\&. Use
 \fB\-\-skip\-opt\fR
 instead\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-.PP
-\fBmysqldump\fR
-from MySQL 5\&.1\&.21 cannot be used to create dumps from MySQL server 5\&.1\&.20 and older\&. This issue is fixed in MySQL 5\&.1\&.22\&. (\m[blue]\fBBug#30123\fR\m[]\&\s-2\u[1]\d\s+2)
-.sp .5v
 .RE
 .PP
 \fBmysqldump\fR
@@ -232,8 +202,7 @@ and
 [client]
 option file groups\&.
 \fBmysqldump\fR
-also supports the options for processing option files described at
-Section\ \&4.2.3.3.1, \(lqCommand-Line Options that Affect Option-File Handling\(rq\&.
+also supports the options for processing option file\&.
 .sp
 .RS 4
 .ie n \{\
@@ -311,8 +280,7 @@ Surround each table dump with
 LOCK TABLES
 and
 UNLOCK TABLES
-statements\&. This results in faster inserts when the dump file is reloaded\&. See
-Section\ \&7.2.21, \(lqSpeed of INSERT Statements\(rq\&.
+statements\&. This results in faster inserts when the dump file is reloaded\&.
 .RE
 .sp
 .RS 4
@@ -351,7 +319,6 @@ NDBCLUSTER
 table\&. This information is not otherwise included in the output from
 \fBmysqldump\fR\&. This option is currently relevant only to MySQL Cluster tables\&.
 .sp
-This option was added in MySQL 5\&.1\&.6\&.
 .RE
 .sp
 .RS 4
@@ -377,12 +344,26 @@ Allow creation of column names that are keywords\&. This works by prefixing each
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: apply-slave-statements option
+.\" apply-slave-statements option: mysqldump
+\fB\-\-apply\-slave\-statements\fR
+.sp
+Adds 'STOP SLAVE' prior to 'CHANGE MASTER' and 'START SLAVE' to bottom of dump\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: character-sets-dir option
 .\" character-sets-dir option: mysqldump
 \fB\-\-character\-sets\-dir=\fR\fB\fIpath\fR\fR
 .sp
-The directory where character sets are installed\&. See
-Section\ \&9.5, \(lqCharacter Set Configuration\(rq\&.
+The directory where character sets are installed\&.
 .RE
 .sp
 .RS 4
@@ -421,24 +402,6 @@ Produce more compact output\&. This option enables the
 \fB\-\-skip\-disable\-keys\fR, and
 \fB\-\-skip\-set\-charset\fR
 options\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBNote\fR
-.ps -1
-.br
-Prior to MySQL 5\&.1\&.21, this option did not create valid SQL if the database dump contained views\&. The recreation of views requires the creation and removal of temporary tables and this option suppressed the removal of those temporary tables\&. As a workaround, use
-\fB\-\-compact\fR
-with the
-\fB\-\-add\-drop\-table\fR
-option and then manually adjust the dump file\&.
-.sp .5v
 .RE
 .RE
 .sp
@@ -467,14 +430,12 @@ db2,
 maxdb,
 no_key_options,
 no_table_options, or
-no_field_options\&. To use several values, separate them by commas\&. These values have the same meaning as the corresponding options for setting the server SQL mode\&. See
-Section\ \&5.1.8, \(lqServer SQL Modes\(rq\&.
+no_field_options\&. To use several values, separate them by commas\&. These values have the same meaning as the corresponding options for setting the server SQL mode\&.
 .sp
 This option does not guarantee compatibility with other servers\&. It only enables those SQL mode values that are currently available for making dump output more compatible\&. For example,
 \fB\-\-compatible=oracle\fR
 does not map data types to Oracle types or use Oracle comment syntax\&.
 .sp
-\fIThis option requires a server version of 4\&.1\&.0 or higher\fR\&. With older servers, it does nothing\&.
 .RE
 .sp
 .RS 4
@@ -524,9 +485,9 @@ Compress all information sent between the client and the server if both support
 \fB\-\-create\-options\fR,
 \fB\-a\fR
 .sp
-Include all MySQL\-specific table options in the
+Include all MariaDB\-specific table options in the
 CREATE TABLE
-statements\&.
+statements\&. Use \fB\-\-skip-create-options\fR to disable.
 .RE
 .sp
 .RS 4
@@ -583,7 +544,7 @@ string is
 .\" debug-check option: mysqldump
 \fB\-\-debug\-check\fR
 .sp
-Print some debugging information when the program exits\&. This option was added in MySQL 5\&.1\&.21\&.
+Print some debugging information when the program exits\&.
 .RE
 .sp
 .RS 4
@@ -598,7 +559,22 @@ Print some debugging information when the program exits\&. This option was added
 .\" debug-info option: mysqldump
 \fB\-\-debug\-info\fR
 .sp
-Print debugging information and memory and CPU usage statistics when the program exits\&. This option was added in MySQL 5\&.1\&.14\&.
+Print debugging information and memory and CPU usage statistics when the program exits\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: default-auth option
+.\" default-auth option: mysqldump
+\fB\-\-default\-auth\fR
+.sp
+Default authentication client-side plugin to use\&.
 .RE
 .sp
 .RS 4
@@ -615,16 +591,11 @@ Print debugging information and memory and CPU usage statistics when the program
 .sp
 Use
 \fIcharset_name\fR
-as the default character set\&. See
-Section\ \&9.5, \(lqCharacter Set Configuration\(rq\&. If no character set is specified,
+as the default character set\&. If no character set is specified,
 \fBmysqldump\fR
 uses
-utf8, and earlier versions use
-latin1\&.
+utf8\&.
 .sp
-Prior to MySQL 5\&.1\&.38, this option has no effect for output data files produced by using the
-\fB\-\-tab\fR
-option\&. See the description for that option\&.
 .RE
 .sp
 .RS 4
@@ -667,6 +638,21 @@ Must be given as first option\&.
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" my_print_defaults: defaults-group-suffix option
+.\" defaults-group-suffix option: my_print_defaults
+\fB\-\-defaults\-group\-suffix=\fR\fB\fIstr\fR\fR,
+.sp
+Also read groups with a suffix of \fIstr\fR\&. For example, since mysqldump normally reads the [client] and [mysqldump] groups, \-\-defaults\-group\-suffix=x would cause it to also read the groups [mysqldump_x] and [client_x]\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: delayed-insert option
 .\" delayed-insert option: mysqldump
 \fB\-\-delayed\-insert\fR
@@ -756,7 +742,7 @@ control whether the date is added to the comment\&. The default is
 \fB\-\-dump\-date\fR
 (include the date in the comment)\&.
 \fB\-\-skip\-dump\-date\fR
-suppresses date printing\&. This option was added in MySQL 5\&.1\&.23\&.
+suppresses date printing\&
 .RE
 .sp
 .RS 4
@@ -772,7 +758,7 @@ suppresses date printing\&. This option was added in MySQL 5\&.1\&.23\&.
 \fB\-\-events\fR,
 \fB\-E\fR
 .sp
-Include Event Scheduler events for the dumped databases in the output\&. This option was added in MySQL 5\&.1\&.8\&.
+Include Event Scheduler events for the dumped databases in the output\&.
 .RE
 .sp
 .RS 4
@@ -821,8 +807,7 @@ These options are used with the
 option and have the same meaning as the corresponding
 FIELDS
 clauses for
-LOAD DATA INFILE\&. See
-Section\ \&12.2.6, \(lqLOAD DATA INFILE Syntax\(rq\&.
+LOAD DATA INFILE\&.
 .RE
 .sp
 .RS 4
@@ -837,11 +822,9 @@ Section\ \&12.2.6, \(lqLOAD DATA INFILE Syntax\(rq\&.
 .\" first-slave option: mysqldump
 \fB\-\-first\-slave\fR
 .sp
-Deprecated\&. Use
+Removed in MariaDB 5.5\&. Use
 \fB\-\-lock\-all\-tables\fR
 instead\&.
-\fB\-\-first\-slave\fR
-is removed in MySQL 5\&.5\&.
 .RE
 .sp
 .RS 4
@@ -857,7 +840,7 @@ is removed in MySQL 5\&.5\&.
 \fB\-\-flush\-logs\fR,
 \fB\-F\fR
 .sp
-Flush the MySQL server log files before starting the dump\&. This option requires the
+Flush the MariaDB server log files before starting the dump\&. This option requires the
 RELOAD
 privilege\&. If you use this option in combination with the
 \fB\-\-all\-databases\fR
@@ -893,7 +876,7 @@ database\&. This option should be used any time the dump contains the
 mysql
 database and any other database that depends on the data in the
 mysql
-database for proper restoration\&. This option was added in MySQL 5\&.1\&.12\&.
+database for proper restoration\&.
 .RE
 .sp
 .RS 4
@@ -930,13 +913,11 @@ prints the error message, but it also writes an SQL comment containing the view
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysqldump: host option
-.\" host option: mysqldump
-\fB\-\-host=\fR\fB\fIhost_name\fR\fR,
-\fB\-h \fR\fB\fIhost_name\fR\fR
+.\" mysqldump: gtid option
+.\" gtid option: mysqldump
+\fB\-\-gtid\fR
 .sp
-Dump data from the MySQL server on the given host\&. The default host is
-localhost\&.
+Available from MariaDB 10.0.13, and is used together with \fB\-\-master\-data\fR and \fB\-\-dump\-slave\fR to more conveniently set up a new GTID slave\&. It causes those options to output SQL statements that configure the slave to use the global transaction ID to connect to the master instead of old-style filename/offset positions\&. The old-style positions are still included in comments when \fB\-\-gtid\fR is used; likewise the GTID position is included in comments even if \fB\-\-gtid\fR is not used\&.
 .RE
 .sp
 .RS 4
@@ -970,6 +951,23 @@ BIT\&.
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: host option
+.\" host option: mysqldump
+\fB\-\-host=\fR\fB\fIhost_name\fR\fR,
+\fB\-h \fR\fB\fIhost_name\fR\fR
+.sp
+Dump data from the MariaDB server on the given host\&. The default host is
+localhost\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: ignore-table option
 .\" ignore-table option: mysqldump
 \fB\-\-ignore\-table=\fR\fB\fIdb_name\&.tbl_name\fR\fR
@@ -985,6 +983,22 @@ Do not dump the given table, which must be specified using both the database and
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: include-master-host-port option
+.\" include-master-host-port option: mysqldump
+\fB\-\-include\-master\-host\-port\fR
+.sp
+Add the MASTER_HOST and MASTER_PORT options for the CHANGE MASTER TO statement when using 
+the \fB--dump-slave\fR option for a slave dump\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: insert-ignore option
 .\" insert-ignore option: mysqldump
 \fB\-\-insert\-ignore\fR
@@ -1013,8 +1027,7 @@ This option is used with the
 option and has the same meaning as the corresponding
 LINES
 clause for
-LOAD DATA INFILE\&. See
-Section\ \&12.2.6, \(lqLOAD DATA INFILE Syntax\(rq\&.
+LOAD DATA INFILE\&.
 .RE
 .sp
 .RS 4
@@ -1063,6 +1076,8 @@ because it does not need to lock the tables at all\&.
 Because
 \fB\-\-lock\-tables\fR
 locks tables for each database separately, this option does not guarantee that the tables in the dump file are logically consistent between databases\&. Tables in different databases may be dumped in completely different states\&.
+.sp
+Use \fB--skip-lock-tables\fR to disable\&.
 .RE
 .sp
 .RS 4
@@ -1077,7 +1092,7 @@ locks tables for each database separately, this option does not guarantee that t
 .\" log-error option: mysqldump
 \fB\-\-log\-error=\fR\fB\fIfile_name\fR\fR
 .sp
-Log warnings and errors by appending them to the named file\&. The default is to do no logging\&. This option was added in MySQL 5\&.1\&.18\&.
+Log warnings and errors by appending them to the named file\&. The default is to do no logging\&.
 .RE
 .sp
 .RS 4
@@ -1110,8 +1125,7 @@ option automatically turns off
 \fB\-\-lock\-tables\fR\&. It also turns on
 \fB\-\-lock\-all\-tables\fR, unless
 \fB\-\-single\-transaction\fR
-also is specified, in which case, a global read lock is acquired only for a short time at the beginning of the dump (see the description for
-\fB\-\-single\-transaction\fR)\&. In all cases, any action on logs happens at the exact moment of the dump\&.
+also is specified\&. In all cases, any action on logs happens at the exact moment of the dump\&.
 .sp
 It is also possible to set up a slave by dumping an existing slave of the master\&. To do this, use the following procedure on the existing slave:
 .sp
@@ -1410,7 +1424,7 @@ This option is shorthand\&. It is the same as specifying
 \fB\-\-extended\-insert\fR
 \fB\-\-lock\-tables\fR
 \fB\-\-quick\fR
-\fB\-\-set\-charset\fR\&. It should give you a fast dump operation and produce a dump file that can be reloaded into a MySQL server quickly\&.
+\fB\-\-set\-charset\fR\&. It should give you a fast dump operation and produce a dump file that can be reloaded into a MariaDB server quickly\&.
 .sp
 \fIThe \fR\fI\fB\-\-opt\fR\fR\fI option is enabled by default\&. Use \fR\fI\fB\-\-skip\-opt\fR\fR\fI to disable it\&.\fR
 See the discussion at the beginning of this section for information about selectively enabling or disabling a subset of the options affected by
@@ -1461,8 +1475,7 @@ option on the command line,
 \fBmysqldump\fR
 prompts for one\&.
 .sp
-Specifying a password on the command line should be considered insecure\&. See
-Section\ \&5.3.2.2, \(lqEnd-User Guidelines for Password Security\(rq\&. You can use an option file to avoid giving the password on the command line\&.
+Specifying a password on the command line should be considered insecure\&. You can use an option file to avoid giving the password on the command line\&.
 .RE
 .sp
 .RS 4
@@ -1489,6 +1502,21 @@ On Windows, connect to the server via a named pipe\&. This option applies only i
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: plugin-dir option
+.\" plugin-dir option: mysqldump
+\fB\-\-plugin\-dir\fR
+.sp
+Directory for client-side plugins\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: port option
 .\" port option: mysqldump
 \fB\-\-port=\fR\fB\fIport_num\fR\fR,
@@ -1509,8 +1537,7 @@ The TCP/IP port number to use for the connection\&.
 .\" protocol option: mysqldump
 \fB\-\-protocol={TCP|SOCKET|PIPE|MEMORY}\fR
 .sp
-The connection protocol to use for connecting to the server\&. It is useful when the other connection parameters normally would cause a protocol to be used other than the one you want\&. For details on the allowable values, see
-Section\ \&4.2.2, \(lqConnecting to the MySQL Server\(rq\&.
+The connection protocol to use for connecting to the server\&. It is useful when the other connection parameters normally would cause a protocol to be used other than the one you want\&.
 .RE
 .sp
 .RS 4
@@ -1543,7 +1570,7 @@ to retrieve rows for a table from the server a row at a time rather than retriev
 .\" print-defaults option: mysqldump
 \fB\-\-print\-defaults\fR
 .sp
-Print the program argument list and exit\&. This must begiven as the first argument\&.
+Print the program argument list and exit\&. This must be given as the first argument\&.
 .RE
 .sp
 .RS 4
@@ -1588,7 +1615,7 @@ Write
 REPLACE
 statements rather than
 INSERT
-statements\&. This option was added in MySQL 5\&.1\&.3\&.
+statements\&.
 .RE
 .sp
 .RS 4
@@ -1639,15 +1666,10 @@ statements to re\-create the routines\&. However, these statements do not includ
 If you require routines to be re\-created with their original timestamp attributes, do not use
 \fB\-\-routines\fR\&. Instead, dump and reload the contents of the
 mysql\&.proc
-table directly, using a MySQL account that has appropriate privileges for the
+table directly, using a MariaDB account that has appropriate privileges for the
 mysql
 database\&.
 .sp
-This option was added in MySQL 5\&.1\&.2\&. Before that, stored routines are not dumped\&. Routine
-DEFINER
-values are not dumped until MySQL 5\&.1\&.8\&. This means that before 5\&.1\&.8, when routines are reloaded, they will be created with the definer set to the reloading user\&. If you require routines to be re\-created with their original definer, dump and load the contents of the
-mysql\&.proc
-table directly as described earlier\&.
 .RE
 .sp
 .RS 4
@@ -1718,14 +1740,6 @@ option are mutually exclusive because
 LOCK TABLES
 causes any pending transactions to be committed implicitly\&.
 .sp
-This option is not supported for MySQL Cluster tables; the results cannot be guaranteed to be consistent due to the fact that the
-NDBCLUSTER
-storage engine supports only the
-READ_COMMITTED
-transaction isolation level\&. You should always use
-NDB
-backup and restore instead\&.
-.sp
 To dump large tables, you should combine the
 \fB\-\-single\-transaction\fR
 option with
@@ -1740,11 +1754,45 @@ option with
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: skip-add-drop-table option
+.\" skip-add-drop-table option: mysqldump
+\fB\-\-skip\-add\-drop\-table\fR
+.sp
+Disable the 
+\fB\-\-add\-drop\-table\fR
+option\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: skip-add-locks option
+.\" skip-add-locks option: mysqldump
+\fB\-\-skip\-add\-locks\fR
+.sp
+Disable the 
+\fB\-\-add\-locks\fR
+option\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: skip-comments option
 .\" skip-comments option: mysqldump
 \fB\-\-skip\-comments\fR
 .sp
-See the description for the
+Disable the 
 \fB\-\-comments\fR
 option\&.
 .RE
@@ -1757,11 +1805,62 @@ option\&.
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: skip-compact option
+.\" skip-compact option: mysqldump
+\fB\-\-skip\-compact\fR
+.sp
+Disable the 
+\fB\-\-compact\fR
+option\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: skip-disable-keys option
+.\" skip-disable-keys option: mysqldump
+\fB\-\-skip\-disable\-keys\fR
+.sp
+Disable the 
+\fB\-\-disable\-keys\fR
+option\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: skip-extended-insert option
+.\" skip-extended-insert option: mysqldump
+\fB\-\-skip\-extended\-insert\fR
+.sp
+Disable the 
+\fB\-\-extended\-insert\fR
+option\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: skip-opt option
 .\" skip-opt option: mysqldump
 \fB\-\-skip\-opt\fR
 .sp
-See the description for the
+Disable the
 \fB\-\-opt\fR
 option\&.
 .RE
@@ -1774,6 +1873,91 @@ option\&.
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysqldump: skip-quick option
+.\" skip-quick option: mysqldump
+\fB\-\-skip\-quick\fR
+.sp
+Disable the 
+\fB\-\-quick\fR
+option\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: skip-quote-names option
+.\" skip-quote-names option: mysqldump
+\fB\-\-skip\-quote\-names\fR
+.sp
+Disable the 
+\fB\-\-quote\-names\fR
+option\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: skip-set-charset option
+.\" skip-set-charset option: mysqldump
+\fB\-\-skip\-set\-charset\fR
+.sp
+Disable the 
+\fB\-\-set\-charset\fR
+option\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: skip-triggers option
+.\" skip-triggers option: mysqldump
+\fB\-\-skip\-triggers\fR
+.sp
+Disable the 
+\fB\-\-triggers\fR
+option\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqldump: skip-tz-utc option
+.\" skip-tz-utc option: mysqldump
+\fB\-\-skip\-tz\-utc\fR
+.sp
+Disable the 
+\fB\-\-tz\-utc\fR
+option\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysqldump: socket option
 .\" socket option: mysqldump
 \fB\-\-socket=\fR\fB\fIpath\fR\fR,
@@ -1791,14 +1975,139 @@ localhost, the Unix socket file to use, or, on Windows, the name of the named pi
 .sp -1
 .IP \(bu 2.3
 .\}
-.\" mysqldump: SSL options
-.\" SSL options: mysqldump
-\fB\-\-ssl*\fR
-.sp
-Options that begin with
+.\" mysqladmin: SSL options
+.\" SSL options: mysqladmin
 \fB\-\-ssl\fR
-specify whether to connect to the server via SSL and indicate where to find SSL keys and certificates\&. See
-Section\ \&5.5.6.3, \(lqSSL Command Options\(rq\&.
+.sp
+Enable SSL for connection (automatically enabled with other flags). Disable with 
+\fB\-\-skip-ssl\fR\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqladmin: SSL CA option
+.\" SSL CA option: mysqladmin
+\fB\-\-ssl\-ca=\fIname\fR
+.sp
+CA file in PEM format (check OpenSSL docs, implies
+\fB\-\-ssl\fR)\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqladmin: SSL CA Path option
+.\" SSL CA Path option: mysqladmin
+\fB\-\-ssl\-capath=\fIname\fR
+.sp
+CA directory (check OpenSSL docs, implies
+\fB\-\-ssl\fR)\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqladmin: SSL Cert option
+.\" SSL Cert option: mysqladmin
+\fB\-\-ssl\-cert=\fIname\fR
+.sp
+X509 cert in PEM format (check OpenSSL docs, implies
+\fB\-\-ssl\fR)\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqladmin: SSL Cipher option
+.\" SSL Cipher option: mysqladmin
+\fB\-\-ssl\-cipher=\fIname\fR
+.sp
+SSL cipher to use (check OpenSSL docs, implies
+\fB\-\-ssl\fR)\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqladmin: SSL Key option
+.\" SSL Key option: mysqladmin
+\fB\-\-ssl\-key=\fIname\fR
+.sp
+X509 key in PEM format (check OpenSSL docs, implies
+\fB\-\-ssl\fR)\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqladmin: SSL Crl option
+.\" SSL CRL option: mysqladmin
+\fB\-\-ssl\-crl=\fIname\fR
+.sp
+Certificate revocation list (check OpenSSL docs, implies
+\fB\-\-ssl\fR)\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqladmin: SSL Crlpath option
+.\" SSL Crlpath option: mysqladmin
+\fB\-\-ssl\-crlpath=\fIname\fR
+.sp
+Certificate revocation list path (check OpenSSL docs, implies
+\fB\-\-ssl\fR)\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysqladmin: SSL Verify Server Cert option
+.\" SSL Verify Server Cert option: mysqladmin
+\fB\-\-ssl\-verify\-server\-cert\fR
+.sp
+Verify server's "Common Name" in its cert against hostname used when connecting. This option is disabled by default\&.
 .RE
 .sp
 .RS 4
@@ -1852,11 +2161,9 @@ and
 \fB\-\-lines\-terminated\-by\fR
 options\&.
 .sp
-As of MySQL 5\&.1\&.38, column values are converted to the character set specified by the
+Column values are converted to the character set specified by the
 \fB\-\-default\-character\-set\fR
-option\&. Prior to 5\&.1\&.38 or if no such option is present, values are dumped using the
-binary
-character set\&. In effect, there is no character set conversion\&. If a table contains columns in several character sets, the output data file will as well and you may not be able to reload the file correctly\&.
+option\&.
 .RE
 .sp
 .RS 4
@@ -1921,7 +2228,7 @@ columns are dumped and reloaded in the time zones local to the source and destin
 also protects against changes due to daylight saving time\&.
 \fB\-\-tz\-utc\fR
 is enabled by default\&. To disable it, use
-\fB\-\-skip\-tz\-utc\fR\&. This option was added in MySQL 5\&.1\&.2\&.
+\fB\-\-skip\-tz\-utc\fR\&.
 .RE
 .sp
 .RS 4
@@ -1937,7 +2244,7 @@ is enabled by default\&. To disable it, use
 \fB\-\-user=\fR\fB\fIuser_name\fR\fR,
 \fB\-u \fR\fB\fIuser_name\fR\fR
 .sp
-The MySQL user name to use when connecting to the server\&.
+The MariaDB user name to use when connecting to the server\&.
 .RE
 .sp
 .RS 4
@@ -2050,14 +2357,14 @@ T}:T{
 T}
 .TE
 .sp 1
-Beginning with MySQL 5\&.1\&.12, the output from the
+The output from the
 \fBmysql\fR
 client when run using the
 \fB\-\-xml\fR
 option also follows the preceding rules\&. (See
 the section called \(lqMYSQL OPTIONS\(rq\&.)
 .sp
-Beginning with MySQL 5\&.1\&.18, XML output from
+XML output from
 \fBmysqldump\fR
 includes the XML namespace, as shown here:
 .sp
@@ -2148,7 +2455,7 @@ creates rows up to
 net_buffer_length
 length\&. If you increase this variable, you should also ensure that the
 net_buffer_length
-variable in the MySQL server is at least this large\&.
+variable in the MariaDB server is at least this large\&.
 .RE
 .PP
 A common use of
@@ -2190,7 +2497,7 @@ shell> \fBmysql \-e "source \fR\fB\fI/path\-to\-backup/backup\-file\&.sql\fR\fR\
 .\}
 .PP
 \fBmysqldump\fR
-is also very useful for populating databases by copying data from one MySQL server to another:
+is also very useful for populating databases by copying data from one MariaDB server to another:
 .sp
 .if n \{\
 .RS 4
@@ -2247,12 +2554,11 @@ shell> \fBmysqldump \-\-all\-databases \-\-single\-transaction > all_databases\&
 This backup acquires a global read lock on all tables (using
 FLUSH TABLES WITH READ LOCK) at the beginning of the dump\&. As soon as this lock has been acquired, the binary log coordinates are read and the lock is released\&. If long updating statements are running when the
 FLUSH
-statement is issued, the MySQL server may get stalled until those statements finish\&. After that, the dump becomes lock free and does not disturb reads and writes on the tables\&. If the update statements that the MySQL server receives are short (in terms of execution time), the initial lock period should not be noticeable, even with many updates\&.
+statement is issued, the MariaDB server may get stalled until those statements finish\&. After that, the dump becomes lock free and does not disturb reads and writes on the tables\&. If the update statements that the MariaDB server receives are short (in terms of execution time), the initial lock period should not be noticeable, even with many updates\&.
 .PP
 For point\-in\-time recovery (also known as
 \(lqroll\-forward,\(rq
-when you need to restore an old backup and replay the changes that happened since that backup), it is often useful to rotate the binary log (see
-Section\ \&5.2.4, \(lqThe Binary Log\(rq) or at least know the binary log coordinates to which the dump corresponds:
+when you need to restore an old backup and replay the changes that happened since that backup), it is often useful to rotate the binary log or at least know the binary log coordinates to which the dump corresponds:
 .sp
 .if n \{\
 .RS 4
@@ -2285,19 +2591,15 @@ options can be used simultaneously, which provides a convenient way to make an o
 InnoDB
 storage engine\&.
 .PP
-For more information on making backups, see
-Section\ \&6.2, \(lqDatabase Backup Methods\(rq, and
-Section\ \&6.3, \(lqExample Backup and Recovery Strategy\(rq\&.
 .\" mysqldump: views
 .\" mysqldump: problems
 .\" mysqldump: workarounds
 .PP
-If you encounter problems backing up views, please read the section that covers restrictions on views which describes a workaround for backing up views when this fails due to insufficient privileges\&. See
-Section\ \&D.4, \(lqRestrictions on Views\(rq\&.
+If you encounter problems backing up views, please read the section that covers restrictions on views which describes a workaround for backing up views when this fails due to insufficient privileges\&.
 .SH "COPYRIGHT"
 .br
 .PP
-Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc.
+Copyright 2007-2008 MySQL AB, 2008-2010 Sun Microsystems, Inc., 2010-2015 MariaDB Foundation
 .PP
 This documentation is free software; you can redistribute it and/or modify it only under the terms of the GNU General Public License as published by the Free Software Foundation; version 2 of the License.
 .PP
@@ -2312,8 +2614,6 @@ Bug#30123
 \%http://bugs.mysql.com/bug.php?id=30123
 .RE
 .SH "SEE ALSO"
-For more information, please refer to the MySQL Reference Manual,
-which may already be installed locally and which is also available
-online at http://dev.mysql.com/doc/.
+For more information, please refer to the MariaDB Knowledge Base, available online at https://mariadb.com/kb/
 .SH AUTHOR
-Sun Microsystems, Inc. (http://www.mysql.com/).
+MariaDB Foundation (http://www.mariadb.org/).