diff options
author | Sergei Golubchik <sergii@pisem.net> | 2014-08-07 18:06:56 +0200 |
---|---|---|
committer | Sergei Golubchik <sergii@pisem.net> | 2014-08-07 18:06:56 +0200 |
commit | 6fb17a06016506498f4de75ff754f500f9f674f1 (patch) | |
tree | d03c86959f150edc0f6f27ca2c06ccbc0e6e5bf0 /man | |
parent | 2023fac28130d7d3f7d6776332239c62c3890195 (diff) | |
parent | a4ab2431a20f6e2198d980f8e84fa7118515ca3b (diff) | |
download | mariadb-git-6fb17a06016506498f4de75ff754f500f9f674f1.tar.gz |
5.5.39 merge
Diffstat (limited to 'man')
-rw-r--r-- | man/CMakeLists.txt | 1 | ||||
-rw-r--r-- | man/aria_pack.1 | 2 | ||||
-rw-r--r-- | man/mysqlbinlog.1 | 7 | ||||
-rw-r--r-- | man/mysqldump.1 | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/man/CMakeLists.txt b/man/CMakeLists.txt index f2842959c3f..c4383b31a17 100644 --- a/man/CMakeLists.txt +++ b/man/CMakeLists.txt @@ -14,6 +14,7 @@ # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA SET(MAN1_SERVER innochecksum.1 my_print_defaults.1 myisam_ftdump.1 myisamchk.1 + aria_chk.1 aria_dump_log.1 aria_ftdump.1 aria_pack.1 aria_read_log.1 myisamlog.1 myisampack.1 mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 mysql_install_db.1 diff --git a/man/aria_pack.1 b/man/aria_pack.1 index 9cec33a3818..ee47f5ff3bb 100644 --- a/man/aria_pack.1 +++ b/man/aria_pack.1 @@ -1,6 +1,6 @@ .TH ARIA_PACK "1" "May 2014" "aria_pack Ver 1.0" "User Commands" .SH NAME -aria_pack \- manual page for aria_pack Ver 1.0 +aria_pack \- generate compressed, read\-only Aria tables .SH SYNOPSIS .B aria_pack [\fIOPTIONS\fR] \fIfilename\fR... diff --git a/man/mysqlbinlog.1 b/man/mysqlbinlog.1 index cc0f62485b5..5e9bc6c2f43 100644 --- a/man/mysqlbinlog.1 +++ b/man/mysqlbinlog.1 @@ -1255,7 +1255,7 @@ indicates a FORMAT_DESCRIPTION_EVENT\&. The following table lists the possible type codes\&. .TS allbox tab(:); -l l l. +l l lx. T{ Type T}:T{ @@ -1389,6 +1389,7 @@ T} T{ 0f T}:T{ +.nf FORMAT_DESCRIPTION_EVENT T}:T{ This indicates the start of a log file written by MySQL 5 or later\&. @@ -1526,7 +1527,7 @@ Master Pos: The position of the next event in the original master log file\&. Flags: 16 flags\&. Currently, the following flags are used\&. The others are reserved for future use\&. .TS allbox tab(:); -l l l. +l l lx. T{ Flag T}:T{ @@ -1537,6 +1538,7 @@ T} T{ 01 T}:T{ +.nf LOG_EVENT_BINLOG_IN_USE_F T}:T{ Log file correctly closed\&. (Used only in @@ -1558,6 +1560,7 @@ T} T{ 04 T}:T{ +.nf LOG_EVENT_THREAD_SPECIFIC_F T}:T{ Set if the event is dependent on the connection it was executed in (for diff --git a/man/mysqldump.1 b/man/mysqldump.1 index 59d2416b25e..fdca51f091a 100644 --- a/man/mysqldump.1 +++ b/man/mysqldump.1 @@ -2027,7 +2027,7 @@ value, an empty string, and the string value are distinguished from one another in the output generated by this option as follows\&. .TS allbox tab(:); -l l. +l lx. T{ \fBValue\fR: T}:T{ |