Commit e36b6480 authored by Otto Kekäläinen's avatar Otto Kekäläinen Committed by Daniel Black

MDEV-23789: Fix unnecessary acute accents in man pages

The man pages has several places where \' is intended to escape the single
quote and just print '. However, in reality this will print an ` (acute
accent). Fix this by removing excess backslashes. Also remove some excess
& in front of dots, such escaping is also unnecessary.

Also join several lines to avoid lone words in quotes to be read by groff
as macros when they are just text.

In a table (t{}) the content must be on new lines separately, so groff
will try to read them as macros too, so use \(aq that renders to '
(single quote).

This error was originally detected by Lintian:
https://lintian.debian.org/tags/acute-accent-in-manual-page

Example of man page sections before and after:

  Make a backup of each table´s data file using the name tbl_name.OLD.
  ->
  Make a backup of each table's data file using the name tbl_name.OLD.

  A typical debug_options string is ´d:t:o,file_name´.
  The default is ´d:t:o,/tmp/my_print_defaults.trace´.
  ->
  A typical debug_options string is 'd:t:o,file_name'.
  The default is 'd:t:o,/tmp/my_print_defaults.trace'.

  shell> mysql --xml -uroot -e "SHOW VARIABLES LIKE ´version%´"
  <?xml version="1.0"?>
  <resultset statement="SHOW VARIABLES LIKE ´version%´" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
  ->
  shell> mysql --xml -uroot -e "SHOW VARIABLES LIKE 'version%'"
  <?xml version="1.0"?>
  <resultset statement="SHOW VARIABLES LIKE 'version%'" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">

This command was used to validate no man pages have syntax errors:

  for x in *.?
  do
    echo "##### $x #####"
    LC_ALL=C.UTF-8 MANROFFSEQ='' MANWIDTH=80 man --warnings -E UTF-8 -l -Tutf8 -Z $x >/dev/null
  done

The man pages are not perfect after this, there are still a lot of
suboptimal syntax, but this helps towards better man pages.

All new code of the whole pull request, including one or several files
that are either new files or modified ones, are contributed under the
BSD-new license. I am contributing on behalf of my employer Amazon Web
Services, Inc.
parent 3430767e
...@@ -100,9 +100,7 @@ the first option, then read this file only, do not read global or per\-user conf ...@@ -100,9 +100,7 @@ the first option, then read this file only, do not read global or per\-user conf
.sp .sp
Write a debugging log\&. A typical Write a debugging log\&. A typical
\fIdebug_options\fR \fIdebug_options\fR
string is string is 'd:t:o,\fIfile_name\fR'. The default is 'd:t:o,/tmp/my_print_defaults.trace'.
\'d:t:o,\fIfile_name\fR\'\&. The default is
\'d:t:o,/tmp/my_print_defaults\&.trace\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
......
...@@ -56,7 +56,7 @@ table\&. You can also specify a table by naming its index file (the file with th ...@@ -56,7 +56,7 @@ table\&. You can also specify a table by naming its index file (the file with th
\&.MYI \&.MYI
suffix)\&. If you do not invoke suffix)\&. If you do not invoke
\fBmyisam_ftdump\fR \fBmyisam_ftdump\fR
in the directory where the table files are located, the table or index file name must be preceded by the path name to the table\'s database directory\&. Index numbers begin with 0\&. in the directory where the table files are located, the table or index file name must be preceded by the path name to the table's database directory\&. Index numbers begin with 0\&.
.PP .PP
Example: Suppose that the Example: Suppose that the
test test
......
...@@ -189,7 +189,7 @@ Otherwise, when you run ...@@ -189,7 +189,7 @@ Otherwise, when you run
.RS 4 .RS 4
.\} .\}
.nf .nf
warning: clients are using or haven\'t closed the table properly warning: clients are using or haven't closed the table properly
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -197,7 +197,7 @@ warning: clients are using or haven\'t closed the table properly ...@@ -197,7 +197,7 @@ warning: clients are using or haven\'t closed the table properly
.PP .PP
This means that you are trying to check a table that has been updated by another program (such as the This means that you are trying to check a table that has been updated by another program (such as the
\fBmysqld\fR \fBmysqld\fR
server) that hasn\'t yet closed the file or that has died without closing the file properly, which can sometimes lead to the corruption of one or more server) that hasn't yet closed the file or that has died without closing the file properly, which can sometimes lead to the corruption of one or more
MyISAM MyISAM
tables\&. tables\&.
.PP .PP
...@@ -273,9 +273,7 @@ Display a help message and exit\&. Options are presented in a single list\&. ...@@ -273,9 +273,7 @@ Display a help message and exit\&. Options are presented in a single list\&.
.sp .sp
Write a debugging log\&. A typical Write a debugging log\&. A typical
\fIdebug_options\fR \fIdebug_options\fR
string is string is 'd:t:o,\fIfile_name\fR'. The default is 'd:t:o,/tmp/myisamchk.trace'.
\'d:t:o,\fIfile_name\fR\'\&. The default is
\'d:t:o,/tmp/myisamchk\&.trace\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
...@@ -729,7 +727,7 @@ the section called \(lqMYISAMCHK TABLE INFORMATION\(rq\&. ...@@ -729,7 +727,7 @@ the section called \(lqMYISAMCHK TABLE INFORMATION\(rq\&.
\fB\-\-fast\fR, \fB\-\-fast\fR,
\fB\-F\fR \fB\-F\fR
.sp .sp
Check only tables that haven\'t been closed properly\&. Check only tables that haven't been closed properly\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
...@@ -826,7 +824,7 @@ Store information in the ...@@ -826,7 +824,7 @@ Store information in the
\&.MYI \&.MYI
file to indicate when the table was checked and whether the table crashed\&. This should be used to get full benefit of the file to indicate when the table was checked and whether the table crashed\&. This should be used to get full benefit of the
\fB\-\-check\-only\-changed\fR \fB\-\-check\-only\-changed\fR
option, but you shouldn\'t use this option if the option, but you shouldn't use this option if the
\fBmysqld\fR \fBmysqld\fR
server is using the table and you are running it with external locking disabled\&. server is using the table and you are running it with external locking disabled\&.
.RE .RE
...@@ -1287,8 +1285,8 @@ Sort records according to a particular index\&. This makes your data much more l ...@@ -1287,8 +1285,8 @@ Sort records according to a particular index\&. This makes your data much more l
SELECT SELECT
and and
ORDER BY ORDER BY
operations that use this index\&. (The first time you use this option to sort a table, it may be very slow\&.) To determine a table\'s index numbers, use operations that use this index\&. (The first time you use this option to sort a table, it may be very slow\&.) To determine a table's index numbers, use
SHOW INDEX, which displays a table\'s indexes in the same order that SHOW INDEX, which displays a table's indexes in the same order that
\fBmyisamchk\fR \fBmyisamchk\fR
sees them\&. Indexes are numbered beginning with 1\&. sees them\&. Indexes are numbered beginning with 1\&.
.sp .sp
...@@ -1616,7 +1614,7 @@ sorted index pages\&. ...@@ -1616,7 +1614,7 @@ sorted index pages\&.
Auto increment key, Auto increment key,
Last value Last value
.sp .sp
The key number associated the table\'s The key number associated the table's
AUTO_INCREMENT AUTO_INCREMENT
column, and the most recently generated value for this column\&. These fields do not appear if there is no such column\&. column, and the most recently generated value for this column\&. These fields do not appear if there is no such column\&.
.RE .RE
...@@ -1757,7 +1755,7 @@ displays some low\-level information: ...@@ -1757,7 +1755,7 @@ displays some low\-level information:
.\} .\}
Key Key
.sp .sp
This key\'s number\&. This value is shown only for the first column of the key\&. If this value is missing, the line corresponds to the second or later column of a multiple\-column key\&. For the table shown in the example, there are two This key's number\&. This value is shown only for the first column of the key\&. If this value is missing, the line corresponds to the second or later column of a multiple\-column key\&. For the table shown in the example, there are two
table description table description
lines for the second index\&. This indicates that it is a multiple\-part index with two parts\&. lines for the second index\&. This indicates that it is a multiple\-part index with two parts\&.
.RE .RE
......
...@@ -125,7 +125,7 @@ Display a help message and exit\&. ...@@ -125,7 +125,7 @@ Display a help message and exit\&.
\fB\-\-backup\fR, \fB\-\-backup\fR,
\fB\-b\fR \fB\-b\fR
.sp .sp
Make a backup of each table\'s data file using the name Make a backup of each table's data file using the name
\fItbl_name\fR\&.OLD\&. \fItbl_name\fR\&.OLD\&.
.RE .RE
.sp .sp
...@@ -160,9 +160,7 @@ Section\ \&9.5, \(lqCharacter Set Configuration\(rq\&. ...@@ -160,9 +160,7 @@ Section\ \&9.5, \(lqCharacter Set Configuration\(rq\&.
.sp .sp
Write a debugging log\&. A typical Write a debugging log\&. A typical
\fIdebug_options\fR \fIdebug_options\fR
string is string is 'd:t:o,\fIfile_name\fR'. The default is 'd:t:o'.
\'d:t:o,\fIfile_name\fR\'\&. The default is
\'d:t:o\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
......
...@@ -191,7 +191,7 @@ shell> \fBmake test force="\-\-skip\-test=init_file"\fR ...@@ -191,7 +191,7 @@ shell> \fBmake test force="\-\-skip\-test=init_file"\fR
.PP .PP
To run To run
\fBmysql\-test\-run\&.pl\fR \fBmysql\-test\-run\&.pl\fR
on Windows, you\'ll need either Cygwin or ActiveState Perl to run it\&. You may also need to install the modules required by the script\&. To run the test script, change location into the on Windows, you'll need either Cygwin or ActiveState Perl to run it\&. You may also need to install the modules required by the script\&. To run the test script, change location into the
mysql\-test mysql\-test
directory, set the directory, set the
MTR_VS_CONFIG MTR_VS_CONFIG
...@@ -1744,7 +1744,7 @@ option, it sets up a secure connection for all test cases\&. In this case, if ...@@ -1744,7 +1744,7 @@ option, it sets up a secure connection for all test cases\&. In this case, if
does not support SSL, does not support SSL,
\fBmysql\-test\-run\&.pl\fR \fBmysql\-test\-run\&.pl\fR
exits with an error message: exits with an error message:
Couldn\'t find support for SSL Couldn't find support for SSL
.RE .RE
.sp .sp
.RS 4 .RS 4
......
...@@ -340,9 +340,7 @@ The database to use\&. ...@@ -340,9 +340,7 @@ The database to use\&.
.sp .sp
Write a debugging log\&. A typical Write a debugging log\&. A typical
\fIdebug_options\fR \fIdebug_options\fR
string is string is 'd:t:o,\fIfile_name\fR'. The default is 'd:t:o,/tmp/mysql.trace'.
\'d:t:o,\fIfile_name\fR\'\&. The default is
\'d:t:o,/tmp/mysql\&.trace\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
...@@ -1529,9 +1527,9 @@ The XML output also uses an XML namespace, as shown here: ...@@ -1529,9 +1527,9 @@ The XML output also uses an XML namespace, as shown here:
.RS 4 .RS 4
.\} .\}
.nf .nf
shell> \fBmysql \-\-xml \-uroot \-e "SHOW VARIABLES LIKE \'version%\'"\fR shell> \fBmysql \-\-xml \-uroot \-e "SHOW VARIABLES LIKE 'version%'"\fR
<?xml version="1\&.0"?> <?xml version="1\&.0"?>
<resultset statement="SHOW VARIABLES LIKE \'version%\'" xmlns:xsi="http://www\&.w3\&.org/2001/XMLSchema\-instance"> <resultset statement="SHOW VARIABLES LIKE 'version%'" xmlns:xsi="http://www\&.w3\&.org/2001/XMLSchema\-instance">
<row> <row>
<field name="Variable_name">version</field> <field name="Variable_name">version</field>
<field name="Value">5\&.0\&.40\-debug</field> <field name="Value">5\&.0\&.40\-debug</field>
...@@ -1665,7 +1663,7 @@ if it exists, and then use either of the following techniques: ...@@ -1665,7 +1663,7 @@ if it exists, and then use either of the following techniques:
Set the Set the
MYSQL_HISTFILE MYSQL_HISTFILE
variable to variable to
/dev/null\&. To cause this setting to take effect each time you log in, put the setting in one of your shell\'s startup files\&. /dev/null\&. To cause this setting to take effect each time you log in, put the setting in one of your shell's startup files\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
...@@ -1713,8 +1711,8 @@ prompt: ...@@ -1713,8 +1711,8 @@ prompt:
.nf .nf
mysql> \fBhelp\fR mysql> \fBhelp\fR
List of all MySQL commands: List of all MySQL commands:
Note that all text commands must be first on line and end with \';\' Note that all text commands must be first on line and end with ';'
? (\e?) Synonym for `help\'\&. ? (\e?) Synonym for 'help'\&.
clear (\ec) Clear command\&. clear (\ec) Clear command\&.
connect (\er) Reconnect to the server\&. Optional arguments are db and host\&. connect (\er) Reconnect to the server\&. Optional arguments are db and host\&.
delimiter (\ed) Set statement delimiter\&. delimiter (\ed) Set statement delimiter\&.
...@@ -1724,7 +1722,7 @@ exit (\eq) Exit mysql\&. Same as quit\&. ...@@ -1724,7 +1722,7 @@ exit (\eq) Exit mysql\&. Same as quit\&.
go (\eg) Send command to mysql server\&. go (\eg) Send command to mysql server\&.
help (\eh) Display this help\&. help (\eh) Display this help\&.
nopager (\en) Disable pager, print to stdout\&. nopager (\en) Disable pager, print to stdout\&.
notee (\et) Don\'t write into outfile\&. notee (\et) Don't write into outfile\&.
pager (\eP) Set PAGER [to_pager]\&. Print the query results via PAGER\&. pager (\eP) Set PAGER [to_pager]\&. Print the query results via PAGER\&.
print (\ep) Print current command\&. print (\ep) Print current command\&.
prompt (\eR) Change your mysql prompt\&. prompt (\eR) Change your mysql prompt\&.
...@@ -1739,8 +1737,8 @@ use (\eu) Use another database\&. Takes database name as argument\&. ...@@ -1739,8 +1737,8 @@ use (\eu) Use another database\&. Takes database name as argument\&.
charset (\eC) Switch to another charset\&. Might be needed for processing charset (\eC) Switch to another charset\&. Might be needed for processing
binlog with multi\-byte charsets\&. binlog with multi\-byte charsets\&.
warnings (\eW) Show warnings after every statement\&. warnings (\eW) Show warnings after every statement\&.
nowarning (\ew) Don\'t show warnings after every statement\&. nowarning (\ew) Don't show warnings after every statement\&.
For server side help, type \'help contents\' For server side help, type 'help contents'
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -1848,7 +1846,7 @@ Change the string that ...@@ -1848,7 +1846,7 @@ Change the string that
\fBmysql\fR \fBmysql\fR
interprets as the separator between SQL statements\&. The default is the semicolon character (\(lq;\(rq)\&. interprets as the separator between SQL statements\&. The default is the semicolon character (\(lq;\(rq)\&.
.sp .sp
The delimiter can be specified as an unquoted or quoted argument\&. Quoting can be done with either single quote (\') or douple quote (") characters\&. To include a quote within a quoted string, either quote the string with the other quote character or escape the quote with a backslash (\(lq\e\(rq) character\&. Backslash should be avoided outside of quoted strings because it is the escape character for MariaDB\&. For an unquoted argument, the delmiter is read up to the first space or end of line\&. For a quoted argument, the delimiter is read up to the matching quote on the line\&. The delimiter can be specified as an unquoted or quoted argument\&. Quoting can be done with either single quote (') or douple quote (") characters\&. To include a quote within a quoted string, either quote the string with the other quote character or escape the quote with a backslash (\(lq\e\(rq) character\&. Backslash should be avoided outside of quoted strings because it is the escape character for MariaDB\&. For an unquoted argument, the delmiter is read up to the first space or end of line\&. For a quoted argument, the delimiter is read up to the matching quote on the line\&.
.sp .sp
When the delimiter recognized by When the delimiter recognized by
\fBmysql\fR \fBmysql\fR
...@@ -2556,7 +2554,7 @@ T}:T{ ...@@ -2556,7 +2554,7 @@ T}:T{
A space (a space follows the backslash) A space (a space follows the backslash)
T} T}
T{ T{
\e\' \e'
T}:T{ T}:T{
Single quote Single quote
T} T}
...@@ -2702,7 +2700,7 @@ prompt ...@@ -2702,7 +2700,7 @@ prompt
.\} .\}
.nf .nf
mysql> \fBprompt (\eu@\eh) [\ed]>\e_\fR mysql> \fBprompt (\eu@\eh) [\ed]>\e_\fR
PROMPT set to \'(\eu@\eh) [\ed]>\e_\' PROMPT set to '(\eu@\eh) [\ed]>\e_'
(\fIuser\fR@\fIhost\fR) [\fIdatabase\fR]> (\fIuser\fR@\fIhost\fR) [\fIdatabase\fR]>
(\fIuser\fR@\fIhost\fR) [\fIdatabase\fR]> prompt (\fIuser\fR@\fIhost\fR) [\fIdatabase\fR]> prompt
Returning to default PROMPT of mysql> Returning to default PROMPT of mysql>
...@@ -2740,7 +2738,7 @@ If there is no match for the search string, the search fails: ...@@ -2740,7 +2738,7 @@ If there is no match for the search string, the search fails:
.nf .nf
mysql> \fBhelp me\fR mysql> \fBhelp me\fR
Nothing found Nothing found
Please try to run \'help contents\' for a list of all accessible topics Please try to run 'help contents' for a list of all accessible topics
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -2756,7 +2754,7 @@ to see a list of the help categories: ...@@ -2756,7 +2754,7 @@ to see a list of the help categories:
.nf .nf
mysql> \fBhelp contents\fR mysql> \fBhelp contents\fR
You asked for help about help category: "Contents" You asked for help about help category: "Contents"
For more information, type \'help <item>\', where <item> is one of the For more information, type 'help <item>', where <item> is one of the
following categories: following categories:
Account Management Account Management
Administration Administration
...@@ -2788,7 +2786,7 @@ shows a list of matching topics: ...@@ -2788,7 +2786,7 @@ shows a list of matching topics:
.nf .nf
mysql> \fBhelp logs\fR mysql> \fBhelp logs\fR
Many help items for your request exist\&. Many help items for your request exist\&.
To make a more specific request, please type \'help <item>\', To make a more specific request, please type 'help <item>',
where <item> is one of the following topics: where <item> is one of the following topics:
SHOW SHOW
SHOW BINARY LOGS SHOW BINARY LOGS
...@@ -2806,7 +2804,7 @@ Use a topic as the search string to see the help entry for that topic: ...@@ -2806,7 +2804,7 @@ Use a topic as the search string to see the help entry for that topic:
.\} .\}
.nf .nf
mysql> \fBhelp show binary logs\fR mysql> \fBhelp show binary logs\fR
Name: \'SHOW BINARY LOGS\' Name: 'SHOW BINARY LOGS'
Description: Description:
Syntax: Syntax:
SHOW BINARY LOGS SHOW BINARY LOGS
...@@ -2906,7 +2904,7 @@ Sometimes you may want your script to display progress information to the user\& ...@@ -2906,7 +2904,7 @@ Sometimes you may want your script to display progress information to the user\&
.RS 4 .RS 4
.\} .\}
.nf .nf
SELECT \'<info_to_display>\' AS \' \'; SELECT '<info_to_display>' AS ' ';
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -2953,7 +2951,7 @@ mail_from: Monty ...@@ -2953,7 +2951,7 @@ mail_from: Monty
sbj: UTF\-8 sbj: UTF\-8
txt: >>>>> "Thimble" == Thimble Smith writes: txt: >>>>> "Thimble" == Thimble Smith writes:
Thimble> Hi\&. I think this is a good idea\&. Is anyone familiar Thimble> Hi\&. I think this is a good idea\&. Is anyone familiar
Thimble> with UTF\-8 or Unicode? Otherwise, I\'ll put this on my Thimble> with UTF\-8 or Unicode? Otherwise, I'll put this on my
Thimble> TODO list and see what happens\&. Thimble> TODO list and see what happens\&.
Yes, please do that\&. Yes, please do that\&.
Regards, Regards,
......
...@@ -123,8 +123,7 @@ The database to use\&. ...@@ -123,8 +123,7 @@ The database to use\&.
.sp .sp
Write a debugging log if MariaDB is built with debugging support\&. The default Write a debugging log if MariaDB is built with debugging support\&. The default
\fIdebug_options\fR \fIdebug_options\fR
value is value is 'd:t:o,/tmp/mysql_client_test.trace'.
\'d:t:o,/tmp/mysql_client_test\&.trace\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
......
...@@ -64,7 +64,7 @@ shell> \fBmysql_tzinfo_to_sql /usr/share/zoneinfo | mysql \-u root mysql\fR ...@@ -64,7 +64,7 @@ shell> \fBmysql_tzinfo_to_sql /usr/share/zoneinfo | mysql \-u root mysql\fR
.\} .\}
.PP .PP
\fBmysql_tzinfo_to_sql\fR \fBmysql_tzinfo_to_sql\fR
reads your system\'s time zone files and generates SQL statements from them\&. reads your system's time zone files and generates SQL statements from them\&.
\fBmysql\fR \fBmysql\fR
processes those statements to load the time zone tables\&. processes those statements to load the time zone tables\&.
.PP .PP
......
...@@ -400,7 +400,7 @@ script at approximately line 18\&. Search for a line that looks like this: ...@@ -400,7 +400,7 @@ script at approximately line 18\&. Search for a line that looks like this:
.RS 4 .RS 4
.\} .\}
.nf .nf
$MYSQL = \'/usr/local/bin/mysql\'; # path to mysql executable $MYSQL = '/usr/local/bin/mysql'; # path to mysql executable
.fi .fi
.if n \{\ .if n \{\
.RE .RE
......
...@@ -22,7 +22,7 @@ mariadb-admin \- client for administering a MariaDB server (mysqladmin is now a ...@@ -22,7 +22,7 @@ mariadb-admin \- client for administering a MariaDB server (mysqladmin is now a
.SH "DESCRIPTION" .SH "DESCRIPTION"
.PP .PP
\fBmysqladmin\fR \fBmysqladmin\fR
is a client for performing administrative operations\&. You can use it to check the server\'s configuration and current status, to create and drop databases, and more\&. is a client for performing administrative operations\&. You can use it to check the server's configuration and current status, to create and drop databases, and more\&.
.PP .PP
Invoke Invoke
\fBmysqladmin\fR \fBmysqladmin\fR
...@@ -763,7 +763,7 @@ If you execute ...@@ -763,7 +763,7 @@ If you execute
\fBmysqladmin shutdown\fR \fBmysqladmin shutdown\fR
when connecting to a local server using a Unix socket file, when connecting to a local server using a Unix socket file,
\fBmysqladmin\fR \fBmysqladmin\fR
waits until the server\'s process ID file has been removed, to ensure that the server has stopped properly\&. waits until the server's process ID file has been removed, to ensure that the server has stopped properly\&.
.\" mysqladmin command options .\" mysqladmin command options
.\" command options: mysqladmin .\" command options: mysqladmin
.\" options: command-line: mysqladmin .\" options: command-line: mysqladmin
...@@ -871,9 +871,7 @@ option is given\&. ...@@ -871,9 +871,7 @@ option is given\&.
.sp .sp
Write a debugging log\&. A typical Write a debugging log\&. A typical
\fIdebug_options\fR \fIdebug_options\fR
string is string is 'd:t:o,\fIfile_name\fR'. The default is 'd:t:o,/tmp/mysqladmin.trace'.
\'d:t:o,\fIfile_name\fR\'\&. The default is
\'d:t:o,/tmp/mysqladmin\&.trace\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
......
...@@ -19,7 +19,7 @@ mariadb-binlog \- utility for processing binary log files (mysqlbinlog is now a ...@@ -19,7 +19,7 @@ mariadb-binlog \- utility for processing binary log files (mysqlbinlog is now a
\fBmysqlbinlog [\fR\fBoptions\fR\fB] \fR\fB\fIlog_file\fR\fR\fB \&.\&.\&.\fR \fBmysqlbinlog [\fR\fBoptions\fR\fB] \fR\fB\fIlog_file\fR\fR\fB \&.\&.\&.\fR
.SH "DESCRIPTION" .SH "DESCRIPTION"
.PP .PP
The server\'s binary log consists of files containing The server's binary log consists of files containing
\(lqevents\(rq \(lqevents\(rq
that describe modifications to database contents\&. The server writes these files in binary format\&. To display their contents in text format, use the that describe modifications to database contents\&. The server writes these files in binary format\&. To display their contents in text format, use the
\fBmysqlbinlog\fR \fBmysqlbinlog\fR
...@@ -455,9 +455,7 @@ with row\-based logging prior to MySQL 5\&.1\&.37\&. ...@@ -455,9 +455,7 @@ with row\-based logging prior to MySQL 5\&.1\&.37\&.
.sp .sp
Write a debugging log\&. A typical Write a debugging log\&. A typical
\fIdebug_options\fR \fIdebug_options\fR
string is string is 'd:t:o,\fIfile_name\fR'. The default is 'd:t:o,/tmp/mysqlbinlog.trace'.
\'d:t:o,\fIfile_name\fR\'\&. The default is
\'d:t:o,/tmp/mysqlbinlog\&.trace\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
...@@ -1422,11 +1420,8 @@ Position: The byte position within the log file\&. ...@@ -1422,11 +1420,8 @@ Position: The byte position within the log file\&.
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
Timestamp: The event timestamp\&. In the example shown, Timestamp: The event timestamp\&. In the example shown, '9d fc 5c 43'
\'9d fc 5c 43\' is the representation of '051024 17:24:13' in hexadecimal\&.
is the representation of
\'051024 17:24:13\'
in hexadecimal\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
...@@ -1437,9 +1432,7 @@ in hexadecimal\&. ...@@ -1437,9 +1432,7 @@ in hexadecimal\&.
.sp -1 .sp -1
.IP \(bu 2.3 .IP \(bu 2.3
.\} .\}
Type: The event type code\&. In the example shown, Type: The event type code\&. In the example shown, '0f' indicates a
\'0f\'
indicates a
FORMAT_DESCRIPTION_EVENT\&. The following table lists the possible type codes\&. FORMAT_DESCRIPTION_EVENT\&. The following table lists the possible type codes\&.
.TS .TS
allbox tab(:); allbox tab(:);
...@@ -1729,14 +1722,11 @@ T}:T{ ...@@ -1729,14 +1722,11 @@ T}:T{
.nf .nf
LOG_EVENT_BINLOG_IN_USE_F LOG_EVENT_BINLOG_IN_USE_F
T}:T{ T}:T{
Log file correctly closed\&. (Used only in Log file correctly closed\&. (Used only in FORMAT_DESCRIPTION_EVENT\&.) If this
FORMAT_DESCRIPTION_EVENT\&.) If flag is set (if the flags are, for example, '01 00') in a
this flag is set (if the flags are, for example, FORMAT_DESCRIPTION_EVENT, the log file has not been properly closed\&. Most
\'01 00\') in a probably this is because of a master crash (for example, due to power
FORMAT_DESCRIPTION_EVENT, the log failure)\&.
file has not been properly closed\&. Most probably
this is because of a master crash (for example, due
to power failure)\&.
T} T}
T{ T{
02 02
...@@ -1752,7 +1742,7 @@ T}:T{ ...@@ -1752,7 +1742,7 @@ T}:T{
LOG_EVENT_THREAD_SPECIFIC_F LOG_EVENT_THREAD_SPECIFIC_F
T}:T{ T}:T{
Set if the event is dependent on the connection it was executed in (for Set if the event is dependent on the connection it was executed in (for
example, \'04 00\'), for example, example, '04 00'), for example,
if the event uses temporary tables\&. if the event uses temporary tables\&.
T} T}
T{ T{
...@@ -1794,8 +1784,8 @@ CREATE TABLE t ...@@ -1794,8 +1784,8 @@ CREATE TABLE t
date DATE NULL date DATE NULL
) ENGINE = InnoDB; ) ENGINE = InnoDB;
START TRANSACTION; START TRANSACTION;
INSERT INTO t VALUES(1, \'apple\', NULL); INSERT INTO t VALUES(1, 'apple', NULL);
UPDATE t SET name = \'pear\', date = \'2009\-01\-01\' WHERE id = 1; UPDATE t SET name = 'pear', date = '2009\-01\-01' WHERE id = 1;
DELETE FROM t WHERE id = 1; DELETE FROM t WHERE id = 1;
COMMIT; COMMIT;
.fi .fi
...@@ -1817,24 +1807,18 @@ shell> \fBmysqlbinlog \fR\fB\fIlog_file\fR\fR ...@@ -1817,24 +1807,18 @@ shell> \fBmysqlbinlog \fR\fB\fIlog_file\fR\fR
\&.\&.\&. \&.\&.\&.
# at 218 # at 218
#080828 15:03:08 server id 1 end_log_pos 258 Write_rows: table id 17 flags: STMT_END_F #080828 15:03:08 server id 1 end_log_pos 258 Write_rows: table id 17 flags: STMT_END_F
BINLOG \' BINLOG 'fAS3SBMBAAAALAAAANoAAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ=
fAS3SBMBAAAALAAAANoAAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ= fAS3SBcBAAAAKAAAAAIBAAAQABEAAAAAAAEAA//8AQAAAAVhcHBsZQ=='/*!*/;
fAS3SBcBAAAAKAAAAAIBAAAQABEAAAAAAAEAA//8AQAAAAVhcHBsZQ==
\'/*!*/;
\&.\&.\&. \&.\&.\&.
# at 302 # at 302
#080828 15:03:08 server id 1 end_log_pos 356 Update_rows: table id 17 flags: STMT_END_F #080828 15:03:08 server id 1 end_log_pos 356 Update_rows: table id 17 flags: STMT_END_F
BINLOG \' BINLOG 'fAS3SBMBAAAALAAAAC4BAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ=
fAS3SBMBAAAALAAAAC4BAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ= fAS3SBgBAAAANgAAAGQBAAAQABEAAAAAAAEAA////AEAAAAFYXBwbGX4AQAAAARwZWFyIbIP'/*!*/;
fAS3SBgBAAAANgAAAGQBAAAQABEAAAAAAAEAA////AEAAAAFYXBwbGX4AQAAAARwZWFyIbIP
\'/*!*/;
\&.\&.\&. \&.\&.\&.
# at 400 # at 400
#080828 15:03:08 server id 1 end_log_pos 442 Delete_rows: table id 17 flags: STMT_END_F #080828 15:03:08 server id 1 end_log_pos 442 Delete_rows: table id 17 flags: STMT_END_F
BINLOG \' BINLOG 'fAS3SBMBAAAALAAAAJABAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ=
fAS3SBMBAAAALAAAAJABAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ= fAS3SBkBAAAAKgAAALoBAAAQABEAAAAAAAEAA//4AQAAAARwZWFyIbIP'/*!*/;
fAS3SBkBAAAAKgAAALoBAAAQABEAAAAAAAEAA//4AQAAAARwZWFyIbIP
\'/*!*/;
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -1859,43 +1843,37 @@ shell> \fBmysqlbinlog \-v \fR\fB\fIlog_file\fR\fR ...@@ -1859,43 +1843,37 @@ shell> \fBmysqlbinlog \-v \fR\fB\fIlog_file\fR\fR
\&.\&.\&. \&.\&.\&.
# at 218 # at 218
#080828 15:03:08 server id 1 end_log_pos 258 Write_rows: table id 17 flags: STMT_END_F #080828 15:03:08 server id 1 end_log_pos 258 Write_rows: table id 17 flags: STMT_END_F
BINLOG \' BINLOG 'fAS3SBMBAAAALAAAANoAAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ=
fAS3SBMBAAAALAAAANoAAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ= fAS3SBcBAAAAKAAAAAIBAAAQABEAAAAAAAEAA//8AQAAAAVhcHBsZQ=='/*!*/;
fAS3SBcBAAAAKAAAAAIBAAAQABEAAAAAAAEAA//8AQAAAAVhcHBsZQ==
\'/*!*/;
### INSERT INTO test\&.t ### INSERT INTO test\&.t
### SET ### SET
### @1=1 ### @1=1
### @2=\'apple\' ### @2='apple'
### @3=NULL ### @3=NULL
\&.\&.\&. \&.\&.\&.
# at 302 # at 302
#080828 15:03:08 server id 1 end_log_pos 356 Update_rows: table id 17 flags: STMT_END_F #080828 15:03:08 server id 1 end_log_pos 356 Update_rows: table id 17 flags: STMT_END_F
BINLOG \' BINLOG 'fAS3SBMBAAAALAAAAC4BAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ=
fAS3SBMBAAAALAAAAC4BAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ= fAS3SBgBAAAANgAAAGQBAAAQABEAAAAAAAEAA////AEAAAAFYXBwbGX4AQAAAARwZWFyIbIP'/*!*/;
fAS3SBgBAAAANgAAAGQBAAAQABEAAAAAAAEAA////AEAAAAFYXBwbGX4AQAAAARwZWFyIbIP
\'/*!*/;
### UPDATE test\&.t ### UPDATE test\&.t
### WHERE ### WHERE
### @1=1 ### @1=1
### @2=\'apple\' ### @2='apple'
### @3=NULL ### @3=NULL
### SET ### SET
### @1=1 ### @1=1
### @2=\'pear\' ### @2='pear'
### @3=\'2009:01:01\' ### @3='2009:01:01'
\&.\&.\&. \&.\&.\&.
# at 400 # at 400
#080828 15:03:08 server id 1 end_log_pos 442 Delete_rows: table id 17 flags: STMT_END_F #080828 15:03:08 server id 1 end_log_pos 442 Delete_rows: table id 17 flags: STMT_END_F
BINLOG \' BINLOG 'fAS3SBMBAAAALAAAAJABAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ=
fAS3SBMBAAAALAAAAJABAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ= fAS3SBkBAAAAKgAAALoBAAAQABEAAAAAAAEAA//4AQAAAARwZWFyIbIP'/*!*/;
fAS3SBkBAAAAKgAAALoBAAAQABEAAAAAAAEAA//4AQAAAARwZWFyIbIP
\'/*!*/;
### DELETE FROM test\&.t ### DELETE FROM test\&.t
### WHERE ### WHERE
### @1=1 ### @1=1
### @2=\'pear\' ### @2='pear'
### @3=\'2009:01:01\' ### @3='2009:01:01'
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -1915,43 +1893,37 @@ shell> \fBmysqlbinlog \-vv \fR\fB\fIlog_file\fR\fR ...@@ -1915,43 +1893,37 @@ shell> \fBmysqlbinlog \-vv \fR\fB\fIlog_file\fR\fR
\&.\&.\&. \&.\&.\&.
# at 218 # at 218
#080828 15:03:08 server id 1 end_log_pos 258 Write_rows: table id 17 flags: STMT_END_F #080828 15:03:08 server id 1 end_log_pos 258 Write_rows: table id 17 flags: STMT_END_F
BINLOG \' BINLOG 'fAS3SBMBAAAALAAAANoAAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ=
fAS3SBMBAAAALAAAANoAAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ= fAS3SBcBAAAAKAAAAAIBAAAQABEAAAAAAAEAA//8AQAAAAVhcHBsZQ=='/*!*/;
fAS3SBcBAAAAKAAAAAIBAAAQABEAAAAAAAEAA//8AQAAAAVhcHBsZQ==
\'/*!*/;
### INSERT INTO test\&.t ### INSERT INTO test\&.t
### SET ### SET
### @1=1 /* INT meta=0 nullable=0 is_null=0 */ ### @1=1 /* INT meta=0 nullable=0 is_null=0 */
### @2=\'apple\' /* VARSTRING(20) meta=20 nullable=0 is_null=0 */ ### @2='apple' /* VARSTRING(20) meta=20 nullable=0 is_null=0 */
### @3=NULL /* VARSTRING(20) meta=0 nullable=1 is_null=1 */ ### @3=NULL /* VARSTRING(20) meta=0 nullable=1 is_null=1 */
\&.\&.\&. \&.\&.\&.
# at 302 # at 302
#080828 15:03:08 server id 1 end_log_pos 356 Update_rows: table id 17 flags: STMT_END_F #080828 15:03:08 server id 1 end_log_pos 356 Update_rows: table id 17 flags: STMT_END_F
BINLOG \' BINLOG 'fAS3SBMBAAAALAAAAC4BAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ=
fAS3SBMBAAAALAAAAC4BAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ= fAS3SBgBAAAANgAAAGQBAAAQABEAAAAAAAEAA////AEAAAAFYXBwbGX4AQAAAARwZWFyIbIP'/*!*/;
fAS3SBgBAAAANgAAAGQBAAAQABEAAAAAAAEAA////AEAAAAFYXBwbGX4AQAAAARwZWFyIbIP
\'/*!*/;
### UPDATE test\&.t ### UPDATE test\&.t
### WHERE ### WHERE
### @1=1 /* INT meta=0 nullable=0 is_null=0 */ ### @1=1 /* INT meta=0 nullable=0 is_null=0 */
### @2=\'apple\' /* VARSTRING(20) meta=20 nullable=0 is_null=0 */ ### @2='apple' /* VARSTRING(20) meta=20 nullable=0 is_null=0 */
### @3=NULL /* VARSTRING(20) meta=0 nullable=1 is_null=1 */ ### @3=NULL /* VARSTRING(20) meta=0 nullable=1 is_null=1 */
### SET ### SET
### @1=1 /* INT meta=0 nullable=0 is_null=0 */ ### @1=1 /* INT meta=0 nullable=0 is_null=0 */
### @2=\'pear\' /* VARSTRING(20) meta=20 nullable=0 is_null=0 */ ### @2='pear' /* VARSTRING(20) meta=20 nullable=0 is_null=0 */
### @3=\'2009:01:01\' /* DATE meta=0 nullable=1 is_null=0 */ ### @3='2009:01:01' /* DATE meta=0 nullable=1 is_null=0 */
\&.\&.\&. \&.\&.\&.
# at 400 # at 400
#080828 15:03:08 server id 1 end_log_pos 442 Delete_rows: table id 17 flags: STMT_END_F #080828 15:03:08 server id 1 end_log_pos 442 Delete_rows: table id 17 flags: STMT_END_F
BINLOG \' BINLOG 'fAS3SBMBAAAALAAAAJABAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ=
fAS3SBMBAAAALAAAAJABAAAAABEAAAAAAAAABHRlc3QAAXQAAwMPCgIUAAQ= fAS3SBkBAAAAKgAAALoBAAAQABEAAAAAAAEAA//4AQAAAARwZWFyIbIP'/*!*/;
fAS3SBkBAAAAKgAAALoBAAAQABEAAAAAAAEAA//4AQAAAARwZWFyIbIP
\'/*!*/;
### DELETE FROM test\&.t ### DELETE FROM test\&.t
### WHERE ### WHERE
### @1=1 /* INT meta=0 nullable=0 is_null=0 */ ### @1=1 /* INT meta=0 nullable=0 is_null=0 */
### @2=\'pear\' /* VARSTRING(20) meta=20 nullable=0 is_null=0 */ ### @2='pear' /* VARSTRING(20) meta=20 nullable=0 is_null=0 */
### @3=\'2009:01:01\' /* DATE meta=0 nullable=1 is_null=0 */ ### @3='2009:01:01' /* DATE meta=0 nullable=1 is_null=0 */
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -1982,7 +1954,7 @@ shell> \fBmysqlbinlog \-v \-\-base64\-output=DECODE\-ROWS \fR\fB\fIlog_file\fR\f ...@@ -1982,7 +1954,7 @@ shell> \fBmysqlbinlog \-v \-\-base64\-output=DECODE\-ROWS \fR\fB\fIlog_file\fR\f
### INSERT INTO test\&.t ### INSERT INTO test\&.t
### SET ### SET
### @1=1 ### @1=1
### @2=\'apple\' ### @2='apple'
### @3=NULL ### @3=NULL
\&.\&.\&. \&.\&.\&.
# at 302 # at 302
...@@ -1990,20 +1962,20 @@ shell> \fBmysqlbinlog \-v \-\-base64\-output=DECODE\-ROWS \fR\fB\fIlog_file\fR\f ...@@ -1990,20 +1962,20 @@ shell> \fBmysqlbinlog \-v \-\-base64\-output=DECODE\-ROWS \fR\fB\fIlog_file\fR\f
### UPDATE test\&.t ### UPDATE test\&.t
### WHERE ### WHERE
### @1=1 ### @1=1
### @2=\'apple\' ### @2='apple'
### @3=NULL ### @3=NULL
### SET ### SET
### @1=1 ### @1=1
### @2=\'pear\' ### @2='pear'
### @3=\'2009:01:01\' ### @3='2009:01:01'
\&.\&.\&. \&.\&.\&.
# at 400 # at 400
#080828 15:03:08 server id 1 end_log_pos 442 Delete_rows: table id 17 flags: STMT_END_F #080828 15:03:08 server id 1 end_log_pos 442 Delete_rows: table id 17 flags: STMT_END_F
### DELETE FROM test\&.t ### DELETE FROM test\&.t
### WHERE ### WHERE
### @1=1 ### @1=1
### @2=\'pear\' ### @2='pear'
### @3=\'2009:01:01\' ### @3='2009:01:01'
.fi .fi
.if n \{\ .if n \{\
.RE .RE
......
...@@ -79,7 +79,7 @@ table, an attempt to check it produces this result: ...@@ -79,7 +79,7 @@ table, an attempt to check it produces this result:
.nf .nf
shell> \fBmysqlcheck test t\fR shell> \fBmysqlcheck test t\fR
test\&.t test\&.t
note : The storage engine for the table doesn\'t support check note : The storage engine for the table doesn't support check
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -381,9 +381,7 @@ treats the first name argument on the command line as a database name and follow ...@@ -381,9 +381,7 @@ treats the first name argument on the command line as a database name and follow
.sp .sp
Write a debugging log\&. A typical Write a debugging log\&. A typical
\fIdebug_options\fR \fIdebug_options\fR
string is string is 'd:t:o,\fIfile_name\fR'. The default is 'd:t:o'.
\'d:t:o,\fIfile_name\fR\'\&. The default is
\'d:t:o\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
......
...@@ -511,7 +511,7 @@ account by executing the following commands for each server: ...@@ -511,7 +511,7 @@ account by executing the following commands for each server:
shell> \fBmysql \-u root \-S /tmp/mysql\&.sock \-p\fR shell> \fBmysql \-u root \-S /tmp/mysql\&.sock \-p\fR
Enter password: Enter password:
mysql> \fBGRANT SHUTDOWN ON *\&.*\fR mysql> \fBGRANT SHUTDOWN ON *\&.*\fR
\-> \fBTO \'multi_admin\'@\'localhost\' IDENTIFIED BY \'multipass\';\fR \-> \fBTO 'multi_admin'@'localhost' IDENTIFIED BY 'multipass';\fR
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -606,7 +606,7 @@ option for ...@@ -606,7 +606,7 @@ option for
\fBmysqld_multi\fR \fBmysqld_multi\fR
script as the Unix script as the Unix
root root
user\&. Having the option in the option file doesn\'t matter; you just get a warning if you are not the superuser and the user\&. Having the option in the option file doesn't matter; you just get a warning if you are not the superuser and the
\fBmysqld\fR \fBmysqld\fR
processes are started under your own Unix account\&. processes are started under your own Unix account\&.
.RE .RE
......
...@@ -327,7 +327,7 @@ directory\&. ...@@ -327,7 +327,7 @@ directory\&.
.sp .sp
Use the Use the
nice nice
program to set the server\'s scheduling priority to the given value\&. program to set the server's scheduling priority to the given value\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
......
...@@ -563,9 +563,7 @@ statements are included in the output before each new database\&. ...@@ -563,9 +563,7 @@ statements are included in the output before each new database\&.
.sp .sp
Write a debugging log\&. A typical Write a debugging log\&. A typical
\fIdebug_options\fR \fIdebug_options\fR
string is string is 'd:t:o,\fIfile_name\fR'. The default value is 'd:t:o,/tmp/mysqldump.trace'.
\'d:t:o,\fIfile_name\fR\'\&. The default value is
\'d:t:o,/tmp/mysqldump\&.trace\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
...@@ -1022,9 +1020,7 @@ Used together with --tab. When enabled, adds header with column names to the top ...@@ -1022,9 +1020,7 @@ Used together with --tab. When enabled, adds header with column names to the top
.\" hex-blob option: mysqldump .\" hex-blob option: mysqldump
\fB\-\-hex\-blob\fR \fB\-\-hex\-blob\fR
.sp .sp
Dump binary columns using hexadecimal notation (for example, Dump binary columns using hexadecimal notation (for example, 'abc' becomes
\'abc\'
becomes
0x616263)\&. The affected data types are 0x616263)\&. The affected data types are
BINARY, BINARY,
VARBINARY, the VARBINARY, the
...@@ -1243,7 +1239,7 @@ It is also possible to set up a slave by dumping an existing slave of the master ...@@ -1243,7 +1239,7 @@ It is also possible to set up a slave by dumping an existing slave of the master
.sp -1 .sp -1
.IP " 1." 4.2 .IP " 1." 4.2
.\} .\}
Stop the slave\'s SQL thread and get its current status: Stop the slave's SQL thread and get its current status:
.sp .sp
.if n \{\ .if n \{\
.RS 4 .RS 4
...@@ -1355,7 +1351,7 @@ On the new slave, set the replication coordinates to those of the master server ...@@ -1355,7 +1351,7 @@ On the new slave, set the replication coordinates to those of the master server
.\} .\}
.nf .nf
mysql> \fBCHANGE MASTER TO\fR mysql> \fBCHANGE MASTER TO\fR
\-> \fBMASTER_LOG_FILE = \'\fR\fB\fIfile_name\fR\fR\fB\', MASTER_LOG_POS = \fR\fB\fIfile_pos\fR\fR\fB;\fR \-> \fBMASTER_LOG_FILE = '\fR\fB\fIfile_name\fR\fR\fB', MASTER_LOG_POS = \fR\fB\fIfile_pos\fR\fR\fB;\fR
.fi .fi
.if n \{\ .if n \{\
.RE .RE
...@@ -1564,7 +1560,7 @@ See the discussion at the beginning of this section for information about select ...@@ -1564,7 +1560,7 @@ See the discussion at the beginning of this section for information about select
.\" order-by-primary option: mysqldump .\" order-by-primary option: mysqldump
\fB\-\-order\-by\-primary\fR \fB\-\-order\-by\-primary\fR
.sp .sp
Dump each table\'s rows sorted by its primary key, or by its first unique index, if such an index exists\&. This is useful when dumping a Dump each table's rows sorted by its primary key, or by its first unique index, if such an index exists\&. This is useful when dumping a
MyISAM MyISAM
table to be loaded into an table to be loaded into an
InnoDB InnoDB
...@@ -2446,7 +2442,7 @@ TIMESTAMP ...@@ -2446,7 +2442,7 @@ TIMESTAMP
columns to be dumped and reloaded between servers in different time zones\&. columns to be dumped and reloaded between servers in different time zones\&.
\fBmysqldump\fR \fBmysqldump\fR
sets its connection time zone to UTC and adds sets its connection time zone to UTC and adds
SET TIME_ZONE=\'+00:00\' SET TIME_ZONE='+00:00'
to the dump file\&. Without this option, to the dump file\&. Without this option,
TIMESTAMP TIMESTAMP
columns are dumped and reloaded in the time zones local to the source and destination servers, which can cause the values to change if the servers are in different time zones\&. columns are dumped and reloaded in the time zones local to the source and destination servers, which can cause the values to change if the servers are in different time zones\&.
...@@ -2515,8 +2511,8 @@ Display version information and exit\&. ...@@ -2515,8 +2511,8 @@ Display version information and exit\&.
.\} .\}
.\" mysqldump: where option .\" mysqldump: where option
.\" where option: mysqldump .\" where option: mysqldump
\fB\-\-where=\'\fR\fB\fIwhere_condition\fR\fR\fB\'\fR, \fB\-\-where='\fR\fB\fIwhere_condition\fR\fR\fB'\fR,
\fB\-w \'\fR\fB\fIwhere_condition\fR\fR\fB\'\fR \fB\-w '\fR\fB\fIwhere_condition\fR\fR\fB'\fR
.sp .sp
Dump only rows selected by the given Dump only rows selected by the given
WHERE WHERE
...@@ -2528,7 +2524,7 @@ Examples: ...@@ -2528,7 +2524,7 @@ Examples:
.RS 4 .RS 4
.\} .\}
.nf .nf
\-\-where="user=\'jimf\'" \-\-where="user='jimf'"
\-w"userid>1" \-w"userid>1"
\-w"userid<1" \-w"userid<1"
.fi .fi
...@@ -2552,11 +2548,8 @@ Examples: ...@@ -2552,11 +2548,8 @@ Examples:
.sp .sp
Write dump output as well\-formed XML\&. Write dump output as well\-formed XML\&.
.sp .sp
\fBNULL\fR\fB, \fR\fB\'NULL\'\fR\fB, and Empty Values\fR: For a column named \fBNULL\fR\fB, \fR\fB'NULL'\fR\fB, and Empty Values\fR: For a column named
\fIcolumn_name\fR, the \fIcolumn_name\fR, the NULL value, an empty string, and the string value 'NULL'
NULL
value, an empty string, and the string value
\'NULL\'
are distinguished from one another in the output generated by this option as follows\&. are distinguished from one another in the output generated by this option as follows\&.
.TS .TS
allbox tab(:); allbox tab(:);
...@@ -2572,12 +2565,12 @@ T}:T{ ...@@ -2572,12 +2565,12 @@ T}:T{
<field name="\fIcolumn_name\fR" xsi:nil="true" /> <field name="\fIcolumn_name\fR" xsi:nil="true" />
T} T}
T{ T{
\'\' (\fIempty string\fR) \(aq\(aq (\fIempty string\fR)
T}:T{ T}:T{
<field name="\fIcolumn_name\fR"></field> <field name="\fIcolumn_name\fR"></field>
T} T}
T{ T{
\'NULL\' (\fIstring value\fR) \(aqNULL\(aq (\fIstring value\fR)
T}:T{ T}:T{
<field name="\fIcolumn_name\fR">NULL</field> <field name="\fIcolumn_name\fR">NULL</field>
T} T}
......
...@@ -27,11 +27,7 @@ Normally, ...@@ -27,11 +27,7 @@ Normally,
\fBmysqldumpslow\fR \fBmysqldumpslow\fR
groups queries that are similar except for the particular values of number and string data values\&. It groups queries that are similar except for the particular values of number and string data values\&. It
\(lqabstracts\(rq \(lqabstracts\(rq
these values to these values to N and 'S' when displaying summary output\&. The
N
and
\'S\'
when displaying summary output\&. The
\fB\-a\fR \fB\-a\fR
and and
\fB\-n\fR \fB\-n\fR
...@@ -79,10 +75,7 @@ Display a help message and exit\&. ...@@ -79,10 +75,7 @@ Display a help message and exit\&.
.\} .\}
\fB\-a\fR \fB\-a\fR
.sp .sp
Do not abstract all numbers to Do not abstract all numbers to N and strings to 'S'.
N
and strings to
\'S\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
......
...@@ -49,7 +49,7 @@ shell> \fBmysqlimport [\fR\fB\fIoptions\fR\fR\fB] \fR\fB\fIdb_name\fR\fR\fB \fR\ ...@@ -49,7 +49,7 @@ shell> \fBmysqlimport [\fR\fB\fIoptions\fR\fR\fB] \fR\fB\fIdb_name\fR\fR\fB \fR\
.PP .PP
For each text file named on the command line, For each text file named on the command line,
\fBmysqlimport\fR \fBmysqlimport\fR
strips any extension from the file name and uses the result to determine the name of the table into which to import the file\'s contents\&. For example, files named strips any extension from the file name and uses the result to determine the name of the table into which to import the file's contents\&. For example, files named
patient\&.txt, patient\&.txt,
patient\&.text, and patient\&.text, and
patient patient
...@@ -144,9 +144,7 @@ Compress all information sent between the client and the server if both support ...@@ -144,9 +144,7 @@ Compress all information sent between the client and the server if both support
.sp .sp
Write a debugging log\&. A typical Write a debugging log\&. A typical
\fIdebug_options\fR \fIdebug_options\fR
string is string is 'd:t:o,\fIfile_name\fR'. The default is 'd:t:o'.
\'d:t:o,\fIfile_name\fR\'\&. The default is
\'d:t:o\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
...@@ -836,7 +834,7 @@ Here is a sample session that demonstrates use of ...@@ -836,7 +834,7 @@ Here is a sample session that demonstrates use of
.RS 4 .RS 4
.\} .\}
.nf .nf
shell> \fBmysql \-e \'CREATE TABLE imptest(id INT, n VARCHAR(30))\' test\fR shell> \fBmysql \-e 'CREATE TABLE imptest(id INT, n VARCHAR(30))' test\fR
shell> \fBed\fR shell> \fBed\fR
a a
100 Max Sydow 100 Max Sydow
...@@ -851,7 +849,7 @@ shell> \fBod \-c imptest\&.txt\fR ...@@ -851,7 +849,7 @@ shell> \fBod \-c imptest\&.txt\fR
0000040 0000040
shell> \fBmysqlimport \-\-local test imptest\&.txt\fR shell> \fBmysqlimport \-\-local test imptest\&.txt\fR
test\&.imptest: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0 test\&.imptest: Records: 2 Deleted: 0 Skipped: 0 Warnings: 0
shell> \fBmysql \-e \'SELECT * FROM imptest\' test\fR shell> \fBmysql \-e 'SELECT * FROM imptest' test\fR
+\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
| id | n | | id | n |
+\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+ +\-\-\-\-\-\-+\-\-\-\-\-\-\-\-\-\-\-\-\-\-\-+
......
...@@ -26,7 +26,7 @@ mariadb-show \- display database, table, and column information (mysqlshow is no ...@@ -26,7 +26,7 @@ mariadb-show \- display database, table, and column information (mysqlshow is no
.PP .PP
The The
\fBmysqlshow\fR \fBmysqlshow\fR
client can be used to quickly see which databases exist, their tables, or a table\'s columns or indexes\&. client can be used to quickly see which databases exist, their tables, or a table's columns or indexes\&.
.PP .PP
\fBmysqlshow\fR \fBmysqlshow\fR
provides a command\-line interface to several SQL provides a command\-line interface to several SQL
...@@ -191,9 +191,7 @@ tables\&. ...@@ -191,9 +191,7 @@ tables\&.
.sp .sp
Write a debugging log\&. A typical Write a debugging log\&. A typical
\fIdebug_options\fR \fIdebug_options\fR
string is string is 'd:t:o,\fIfile_name\fR'. The default is 'd:t:o'.
\'d:t:o,\fIfile_name\fR\'\&. The default is
\'d:t:o\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
......
...@@ -105,7 +105,7 @@ build the query SQL statement with a table of two ...@@ -105,7 +105,7 @@ build the query SQL statement with a table of two
INT INT
columns and three columns and three
VARCHAR VARCHAR
columns\&. Use five clients querying 20 times each\&. Do not create the table or insert the data (that is, use the previous test\'s schema and data): columns\&. Use five clients querying 20 times each\&. Do not create the table or insert the data (that is, use the previous test's schema and data):
.sp .sp
.if n \{\ .if n \{\
.RS 4 .RS 4
...@@ -119,15 +119,11 @@ mysqlslap \-\-concurrency=5 \-\-iterations=20 \e ...@@ -119,15 +119,11 @@ mysqlslap \-\-concurrency=5 \-\-iterations=20 \e
.RE .RE
.\} .\}
.PP .PP
Tell the program to load the create, insert, and query SQL statements from the specified files, where the Tell the program to load the create, insert, and query SQL statements from the specified files, where the create\&.sql
create\&.sql file has multiple table creation statements delimited by ';' and multiple insert statements delimited by ';'\&. The
file has multiple table creation statements delimited by
\';\'
and multiple insert statements delimited by
\';\'\&. The
\fB\-\-query\fR \fB\-\-query\fR
file will have multiple queries delimited by file will have multiple queries delimited by ';'\&. Run all the load statements,
\';\'\&. Run all the load statements, then run all the queries in the query file with five clients (five times each): then run all the queries in the query file with five clients (five times each):
.sp .sp
.if n \{\ .if n \{\
.RS 4 .RS 4
...@@ -427,9 +423,7 @@ Generate output in comma\-separated values format\&. The output goes to the name ...@@ -427,9 +423,7 @@ Generate output in comma\-separated values format\&. The output goes to the name
.sp .sp
Write a debugging log\&. A typical Write a debugging log\&. A typical
\fIdebug_options\fR \fIdebug_options\fR
string is string is 'd:t:o,\fIfile_name\fR'. The default is 'd:t:o,/tmp/mysqlslap.trace'.
\'d:t:o,\fIfile_name\fR\'\&. The default is
\'d:t:o,/tmp/mysqlslap\&.trace\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
......
...@@ -270,8 +270,7 @@ The default database to use\&. ...@@ -270,8 +270,7 @@ The default database to use\&.
.sp .sp
Write a debugging log if MariaDB is built with debugging support\&. The default Write a debugging log if MariaDB is built with debugging support\&. The default
\fIdebug_options\fR \fIdebug_options\fR
value is value is 'd:t:S:i:O,/tmp/mysqltest.trace'.
\'d:t:S:i:O,/tmp/mysqltest\&.trace\'\&.
.RE .RE
.sp .sp
.RS 4 .RS 4
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment