Imported MySQL documentation files from MySQL 5.1.41 source tarball

Docs/INSTALL-BINARY

 
-2.9. Installing MySQL from tar.gz Packages on Other Unix-Like Systems
+2.2. Installing MySQL from Generic Binaries on Unix/Linux
 
    This section covers the installation of MySQL binary distributions
    that are provided for various platforms in the form of compressed
-   tar files (files with a .tar.gz extension). See Section 2.1.2.4,
-   "MySQL Binaries Compiled by Sun Microsystems, Inc.," for a
+   tar files (files with a .tar.gz extension). See Section 2.2,
+   "Installing MySQL from Generic Binaries on Unix/Linux," for a
    detailed list.
 
    To obtain MySQL, see Section 2.1.3, "How to Get MySQL."
 
+   Sun Microsystems, Inc. provides a set of binary distributions of
+   MySQL. In addition to binaries provided in platform-specific
+   package formats, we offer binary distributions for a number of
+   platforms in the form of compressed tar files (.tar.gz files). For
+   Windows distributions, see Section 2.5, "Installing MySQL on
+   Windows."
+
+   If you want to compile a debug version of MySQL from a source
+   distribution, you should add --with-debug or --with-debug=full to
+   the configure command used to configure the distribution and
+   remove any -fomit-frame-pointer options.
+
    MySQL tar file binary distributions have names of the form
    mysql-VERSION-OS.tar.gz, where VERSION is a number (for example,
-   5.1.39), and OS indicates the type of operating system for which
+   5.1.41), and OS indicates the type of operating system for which
    the distribution is intended (for example, pc-linux-i686).
 
    In addition to these generic packages, we also offer binaries in
-   platform-specific package formats for selected platforms. See
-   Section 2.2, "Standard MySQL Installation Using a Binary
-   Distribution," for more information on how to install these.
+   platform-specific package formats for selected platforms. See the
+   platform specific sections for more information, for more
+   information on how to install these.
 
    You need the following tools to install a MySQL tar file binary
    distribution:
@@ -27,11 +39,13 @@
      * A reasonable tar to unpack the distribution. GNU tar is known
        to work. Some operating systems come with a preinstalled
        version of tar that is known to have problems. For example,
-       the tar provided with early versions of Mac OS X, SunOS 4.x
-       and Solaris 8 and earlier are known to have problems with long
-       file names. On Mac OS X, you can use the preinstalled gnutar
-       program. On other systems with a deficient tar, you should
-       install GNU tar first.
+       the tar provided with early versions of Mac OS X, SunOS 4.x,
+       Solaris 8, Solaris 9, Solaris 10 and OpenSolaris, and HP-UX
+       are known to have problems with long file names. On Mac OS X,
+       you can use the preinstalled gnutar program. On Solaris 10 and
+       OpenSolaris you can use the preinstalled gtar. On other
+       systems with a deficient tar, you should install GNU tar
+       first.
 
    If you run into problems and need to file a bug report, please use
    the instructions in Section 1.6, "How to Report Bugs or Problems."
@@ -54,7 +68,7 @@ shell> bin/mysqld_safe --user=mysql &
 Note
 
    This procedure does not set up any passwords for MySQL accounts.
-   After following the procedure, proceed to Section 2.11,
+   After following the procedure, proceed to Section 2.13,
    "Post-Installation Setup and Testing."
 
    A more detailed version of the preceding description for
@@ -148,7 +162,7 @@ shell> chown -R mysql data
        machine, you can copy support-files/mysql.server to the
        location where your system has its startup files. More
        information can be found in the support-files/mysql.server
-       script itself and in Section 2.11.2.2, "Starting and Stopping
+       script itself and in Section 2.13.1.2, "Starting and Stopping
        MySQL Automatically."
    10. You can set up new accounts using the bin/mysql_setpermission
        script if you install the DBI and DBD::mysql Perl modules. See
@@ -187,5 +201,5 @@ Note
 
    The accounts that are listed in the MySQL grant tables initially
    have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.11,
+   passwords for them using the instructions in Section 2.13,
    "Post-Installation Setup and Testing."

INSTALL-WIN-SOURCE

 
-2.10.6. Installing MySQL from Source on Windows
+2.5.10. Installing MySQL from Source on Windows
 
    These instructions describe how to build binaries from source for
    MySQL 5.1 on Windows. Instructions are provided for building
@@ -15,7 +15,7 @@ Note
    to use precompiled binary distributions of MySQL that are built
    specifically for optimal performance on Windows by Sun
    Microsystems, Inc. Instructions for installing binary
-   distributions are available in Section 2.3, "Installing MySQL on
+   distributions are available in Section 2.5, "Installing MySQL on
    Windows."
 
    To build MySQL on Windows from source, you must satisfy the
@@ -68,7 +68,7 @@ Note
 
      * 3GB to 5GB of disk space.
 
-   The exact system requirements can be found here:
+   The exact system requirements for Visual Studio can be found here:
    http://msdn.microsoft.com/vstudio/Previous/2003/sysreqs/default.as
    px and
    http://msdn.microsoft.com/vstudio/products/sysreqs/default.aspx
@@ -81,7 +81,7 @@ Note
 
      * Package a source distribution yourself from the latest Bazaar
        developer source tree. For instructions on pulling the latest
-       source files, see Section 2.10.3, "Installing from the
+       source files, see Section 2.3.3, "Installing from the
        Development Source Tree."
 
    If you find something not working as expected, or you have
@@ -89,7 +89,7 @@ Note
    Windows, please send a message to the win32 mailing list. See
    Section 1.5.1, "MySQL Mailing Lists."
 
-2.10.6.1. Building MySQL from Source Using CMake and Visual Studio
+2.5.10.1. Building MySQL from Source Using CMake and Visual Studio
 
    You can build MySQL on Windows by using a combination of cmake and
    Microsoft Visual Studio .NET 2003 (7.1), Microsoft Visual Studio
@@ -99,7 +99,7 @@ Note
 Note
 
    To compile from the source code on Windows you must use the
-   standard source distribution (for example, mysql-5.0.45.tar.gz).
+   standard source distribution (for example, mysql-5.1.41.tar.gz).
    You build from the same distribution as used to build MySQL on
    Unix, Linux and other platforms. Do not use the Windows Source
    distributions as they do not contain the necessary configuration
@@ -264,5 +264,5 @@ C:\workdir> copy libmysql\libmysql.def C:\mysql\include
 C:\workdir> xcopy sql-bench\*.* C:\mysql\bench /E
 
    After installation, set up and start the server in the same way as
-   for binary Windows distributions. See Section 2.3, "Installing
+   for binary Windows distributions. See Section 2.5, "Installing
    MySQL on Windows."

man/comp_err.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBcomp_err\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBCOMP_ERR\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBCOMP_ERR\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -91,7 +91,8 @@ Display a help message and exit\&.
 .\}
 .\" comp_err: charset option
 .\" charset option: comp_err
-\fB\-\-charset=\fR\fB\fIpath\fR\fR\fB, \-C \fR\fB\fIpath\fR\fR
+\fB\-\-charset=\fR\fB\fIpath\fR\fR,
+\fB\-C \fR\fB\fIpath\fR\fR
 .sp
 The character set directory\&. The default is
 \&.\&./sql/share/charsets\&.
@@ -107,7 +108,8 @@ The character set directory\&. The default is
 .\}
 .\" comp_err: debug option
 .\" debug option: comp_err
-\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR\fB, \-# \fR\fB\fIdebug_options\fR\fR
+\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
+\fB\-# \fR\fB\fIdebug_options\fR\fR
 .sp
 Write a debugging log\&. A typical
 \fIdebug_options\fR
@@ -142,7 +144,8 @@ Print some debugging information when the program exits\&.
 .\}
 .\" comp_err: header_file option
 .\" header_file option: comp_err
-\fB\-\-header_file=\fR\fB\fIfile_name\fR\fR\fB, \-H \fR\fB\fIfile_name\fR\fR
+\fB\-\-header_file=\fR\fB\fIfile_name\fR\fR,
+\fB\-H \fR\fB\fIfile_name\fR\fR
 .sp
 The name of the error header file\&. The default is
 mysqld_error\&.h\&.
@@ -158,7 +161,8 @@ mysqld_error\&.h\&.
 .\}
 .\" comp_err: in_file option
 .\" in_file option: comp_err
-\fB\-\-in_file=\fR\fB\fIfile_name\fR\fR\fB, \-F \fR\fB\fIfile_name\fR\fR
+\fB\-\-in_file=\fR\fB\fIfile_name\fR\fR,
+\fB\-F \fR\fB\fIfile_name\fR\fR
 .sp
 The name of the input file\&. The default is
 \&.\&./sql/share/errmsg\&.txt\&.
@@ -174,7 +178,8 @@ The name of the input file\&. The default is
 .\}
 .\" comp_err: name_file option
 .\" name_file option: comp_err
-\fB\-\-name_file=\fR\fB\fIfile_name\fR\fR\fB, \-N \fR\fB\fIfile_name\fR\fR
+\fB\-\-name_file=\fR\fB\fIfile_name\fR\fR,
+\fB\-N \fR\fB\fIfile_name\fR\fR
 .sp
 The name of the error name file\&. The default is
 mysqld_ername\&.h\&.
@@ -190,7 +195,8 @@ mysqld_ername\&.h\&.
 .\}
 .\" comp_err: out_dir option
 .\" out_dir option: comp_err
-\fB\-\-out_dir=\fR\fB\fIpath\fR\fR\fB, \-D \fR\fB\fIpath\fR\fR
+\fB\-\-out_dir=\fR\fB\fIpath\fR\fR,
+\fB\-D \fR\fB\fIpath\fR\fR
 .sp
 The name of the output base directory\&. The default is
 \&.\&./sql/share/\&.
@@ -206,7 +212,8 @@ The name of the output base directory\&. The default is
 .\}
 .\" comp_err: out_file option
 .\" out_file option: comp_err
-\fB\-\-out_file=\fR\fB\fIfile_name\fR\fR\fB, \-O \fR\fB\fIfile_name\fR\fR
+\fB\-\-out_file=\fR\fB\fIfile_name\fR\fR,
+\fB\-O \fR\fB\fIfile_name\fR\fR
 .sp
 The name of the output file\&. The default is
 errmsg\&.sys\&.
@@ -222,7 +229,8 @@ errmsg\&.sys\&.
 .\}
 .\" comp_err: statefile option
 .\" statefile option: comp_err
-\fB\-\-statefile=\fR\fB\fIfile_name\fR\fR\fB, \-S \fR\fB\fIfile_name\fR\fR
+\fB\-\-statefile=\fR\fB\fIfile_name\fR\fR,
+\fB\-S \fR\fB\fIfile_name\fR\fR
 .sp
 The name for the SQLSTATE header file\&. The default is
 sql_state\&.h\&.

man/innochecksum.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBinnochecksum\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBINNOCHECKSUM\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBINNOCHECKSUM\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -29,7 +29,20 @@ innochecksum \- offline InnoDB file checksum utility
 \fBinnochecksum\fR
 prints checksums for
 InnoDB
-files\&.
+files\&. This tool reads an
+InnoDB
+tablespace file, calculates the checksum for each page, compares the calculated checksum to the stored checksum, and reports mismatches, which indicate damaged pages\&. It was originally developed to speed up verifying the integrity of tablespace files after power outages but can also be used after file copies\&. Because checksum mismatches will cause
+InnoDB
+to deliberately shut down a running server, it can be preferable to use this tool rather than waiting for a server in production usage to encounter the damaged pages\&.
+.PP
+\fBinnochecksum\fR
+cannot be used on tablespace files that the server already has open\&. For such files, you should use
+CHECK TABLE
+to check tables within the tablespace\&.
+.PP
+If checksum mismatches are found, you would normally restore the tablespace from backup or start the server and attempt to use
+\fBmysqldump\fR
+to make a backup of the tables within the tablespace\&.
 .PP
 Invoke
 \fBinnochecksum\fR

man/make_win_bin_dist.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmake_win_bin_dist\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMAKE_WIN_BIN_DIST" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMAKE_WIN_BIN_DIST" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/msql2mysql.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmsql2mysql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMSQL2MYSQL\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMSQL2MYSQL\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/my_print_defaults.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmy_print_defaults\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMY_PRINT_DEFAULTS" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMY_PRINT_DEFAULTS" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -100,7 +100,8 @@ Read only the given option file\&.
 .\}
 .\" my_print_defaults: debug option
 .\" debug option: my_print_defaults
-\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR\fB, \-# \fR\fB\fIdebug_options\fR\fR
+\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
+\fB\-# \fR\fB\fIdebug_options\fR\fR
 .sp
 Write a debugging log\&. A typical
 \fIdebug_options\fR

man/myisam_ftdump.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisam_ftdump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYISAM_FTDUMP\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYISAM_FTDUMP\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/myisamchk.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisamchk\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYISAMCHK\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYISAMCHK\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -275,7 +275,8 @@ Display a help message and exit\&. Options are presented in a single list\&.
 .\}
 .\" myisamchk: debug option
 .\" debug option: myisamchk
-\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR\fB, \-# \fR\fB\fIdebug_options\fR\fR
+\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
+\fB\-# \fR\fB\fIdebug_options\fR\fR
 .sp
 Write a debugging log\&. A typical
 \fIdebug_options\fR
@@ -520,7 +521,7 @@ system variable\&. For more information, see the description of
 myisam_stats_method
 in
 Section\ \&5.1.4, \(lqServer System Variables\(rq, and
-Section\ \&7.4.6, \(lqMyISAM Index Statistics Collection\(rq\&. For MySQL 5\&.1,
+Section\ \&7.4.7, \(lqMyISAM Index Statistics Collection\(rq\&. For MySQL 5\&.1,
 stats_method
 was added in MySQL 5\&.0\&.14\&. For older versions, the statistics collection method is equivalent to
 nulls_equal\&.
@@ -662,6 +663,9 @@ If you are using
 and have plenty of memory, setting the
 key_buffer_size
 variable to a large value helps the repair operation run faster\&.
+.sp
+For a description of the output format, see
+the section called \(lqMYISAMCHK TABLE INFORMATION\(rq\&.
 .RE
 .sp
 .RS 4
@@ -782,7 +786,11 @@ server is using the table and you are running it with external locking disabled\
 .\" files: repairing
 .PP
 \fBmyisamchk\fR
-supports the following options for table repair operations:
+supports the following options for table repair operations (operations performed when an option such as
+\fB\-\-recover\fR
+or
+\fB\-\-safe\-recover\fR
+is given):
 .sp
 .RS 4
 .ie n \{\
@@ -844,7 +852,8 @@ Correct the checksum information for the table\&.
 .\}
 .\" myisamchk: data-file-length option
 .\" data-file-length option: myisamchk
-\fB\-\-data\-file\-length=\fR\fB\fIlen\fR\fR\fB, \-D \fR\fB\fIlen\fR\fR
+\fB\-\-data\-file\-length=\fR\fB\fIlen\fR\fR,
+\fB\-D \fR\fB\fIlen\fR\fR
 .sp
 The maximum length of the data file (when re\-creating data file when it is
 \(lqfull\(rq)\&.
@@ -864,6 +873,9 @@ The maximum length of the data file (when re\-creating data file when it is
 \fB\-e\fR
 .sp
 Do a repair that tries to recover every possible row from the data file\&. Normally, this also finds a lot of garbage rows\&. Do not use this option unless you are desperate\&.
+.sp
+For a description of the output format, see
+the section called \(lqMYISAMCHK TABLE INFORMATION\(rq\&.
 .RE
 .sp
 .RS 4
@@ -1172,7 +1184,10 @@ Find the record that a block at the given offset belongs to\&.
 \fB\-\-description\fR,
 \fB\-d\fR
 .sp
-Print some descriptive information about the table\&.
+Print some descriptive information about the table\&. Specifying the
+\fB\-\-verbose\fR
+option once or twice produces additional information\&. See
+the section called \(lqMYISAMCHK TABLE INFORMATION\(rq\&.
 .RE
 .sp
 .RS 4
@@ -1243,47 +1258,187 @@ sorts and moves records, it just overwrites record offsets in the index\&. If ke
 \fBmyisamchk\fR
 must unpack key blocks first, then re\-create indexes and pack the key blocks again\&. (In this case, re\-creating indexes is faster than updating offsets for each index\&.)
 .RE
-.SH "MYISAMCHK MEMORY USAGE"
-.\" memory usage: myisamchk
+.SH "MYISAMCHK TABLE INFORMATION"
+.\" table description: myisamchk
+.\" tables: information
+.\" examples: myisamchk output
+.\" myisamchk: example output
 .PP
-Memory allocation is important when you run
-\fBmyisamchk\fR\&.
+To obtain a description of a
+MyISAM
+table or statistics about it, use the commands shown here\&. The output from these commands is explained later in this section\&.
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBmyisamchk \-d \fR\fB\fItbl_name\fR\fR
+.sp
+Runs
 \fBmyisamchk\fR
-uses no more memory than its memory\-related variables are set to\&. If you are going to use
+in
+\(lqdescribe mode\(rq
+to produce a description of your table\&. If you start the MySQL server with external locking disabled,
 \fBmyisamchk\fR
-on very large tables, you should first decide how much memory you want it to use\&. The default is to use only about 3MB to perform repairs\&. By using larger values, you can get
+may report an error for a table that is updated while it runs\&. However, because
 \fBmyisamchk\fR
-to operate faster\&. For example, if you have more than 32MB RAM, you could use options such as these (in addition to any other options you might specify):
+does not change the table in describe mode, there is no risk of destroying data\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBmyisamchk \-dv \fR\fB\fItbl_name\fR\fR
+.sp
+Adding
+\fB\-v\fR
+runs
+\fBmyisamchk\fR
+in verbose mode so that it produces more information about the table\&. Adding
+\fB\-v\fR
+a second time produces even more information\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBmyisamchk \-eis \fR\fB\fItbl_name\fR\fR
+.sp
+Shows only the most important information from a table\&. This operation is slow because it must read the entire table\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+\fBmyisamchk \-eiv \fR\fB\fItbl_name\fR\fR
+.sp
+This is like
+\fB\-eis\fR, but tells you what is being done\&.
+.RE
+.PP
+The
+\fItbl_name\fR
+argument can be either the name of a
+MyISAM
+table or the name of its index file, as described in
+\fBmyisamchk\fR(1)\&. Multiple
+\fItbl_name\fR
+arguments can be given\&.
+.PP
+Suppose that a table named
+person
+has the following structure\&. (The
+MAX_ROWS
+table option is included so that in the example output from
+\fBmyisamchk\fR
+shown later, some values are smaller and fit the output format more easily\&.)
 .sp
 .if n \{\
 .RS 4
 .\}
 .nf
-shell> \fBmyisamchk \-\-sort_buffer_size=16M \-\-key_buffer_size=16M \e\fR
-           \fB\-\-read_buffer_size=1M \-\-write_buffer_size=1M \&.\&.\&.\fR
+CREATE TABLE person
+(
+  id         INT NOT NULL AUTO_INCREMENT,
+  last_name  VARCHAR(20) NOT NULL,
+  first_name VARCHAR(20) NOT NULL,
+  birth      DATE,
+  death      DATE,
+  PRIMARY KEY (id),
+  INDEX (last_name, first_name),
+  INDEX (birth)
+) MAX_ROWS = 1000000;
 .fi
 .if n \{\
 .RE
 .\}
 .PP
-Using
-\fB\-\-sort_buffer_size=16M\fR
-should probably be enough for most cases\&.
+Suppose also that the table has these data and index file sizes:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+\-rw\-rw\-\-\-\-  1 mysql  mysql  9347072 Aug 19 11:47 person\&.MYD
+\-rw\-rw\-\-\-\-  1 mysql  mysql  6066176 Aug 19 11:47 person\&.MYI
+.fi
+.if n \{\
+.RE
+.\}
 .PP
-Be aware that
-\fBmyisamchk\fR
-uses temporary files in
-TMPDIR\&. If
-TMPDIR
-points to a memory file system, you may easily get out of memory errors\&. If this happens, run
-\fBmyisamchk\fR
-with the
-\fB\-\-tmpdir=\fR\fB\fIpath\fR\fR
-option to specify some directory located on a file system that has more space\&.
+Example of
+\fBmyisamchk \-dvv\fR
+output:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+MyISAM file:         person
+Record format:       Packed
+Character set:       latin1_swedish_ci (8)
+File\-version:        1
+Creation time:       2009\-08\-19 16:47:41
+Recover time:        2009\-08\-19 16:47:56
+Status:              checked,analyzed,optimized keys
+Auto increment key:              1  Last value:                306688
+Data records:               306688  Deleted blocks:                 0
+Datafile parts:             306688  Deleted data:                   0
+Datafile pointer (bytes):        4  Keyfile pointer (bytes):        3
+Datafile length:           9347072  Keyfile length:           6066176
+Max datafile length:    4294967294  Max keyfile length:   17179868159
+Recordlength:                   54
+table description:
+Key Start Len Index   Type                 Rec/key         Root  Blocksize
+1   2     4   unique  long                       1        99328       1024
+2   6     20  multip\&. varchar prefix           512      3563520       1024
+    27    20          varchar                  512
+3   48    3   multip\&. uint24 NULL           306688      6065152       1024
+Field Start Length Nullpos Nullbit Type
+1     1     1
+2     2     4                      no zeros
+3     6     21                     varchar
+4     27    21                     varchar
+5     48    3      1       1       no zeros
+6     51    3      1       2       no zeros
+.fi
+.if n \{\
+.RE
+.\}
 .PP
-When repairing,
+Explanations for the types of information
 \fBmyisamchk\fR
-also needs a lot of disk space:
+produces are given here\&.
+\(lqKeyfile\(rq
+refers to the index file\&.
+\(lqRecord\(rq
+and
+\(lqrow\(rq
+are synonymous, as are
+\(lqfield\(rq
+and
+\(lqcolumn\&.\(rq
+.PP
+The initial part of the table description contains these values:
 .sp
 .RS 4
 .ie n \{\
@@ -1293,9 +1448,11 @@ also needs a lot of disk space:
 .sp -1
 .IP \(bu 2.3
 .\}
-Double the size of the data file (the original file and a copy)\&. This space is not needed if you do a repair with
-\fB\-\-quick\fR; in this case, only the index file is re\-created\&.
-\fIThis space must be available on the same file system as the original data file\fR, as the copy is created in the same directory as the original\&.
+MyISAM file
+.sp
+Name of the
+MyISAM
+(index) file\&.
 .RE
 .sp
 .RS 4
@@ -1306,7 +1463,13 @@ Double the size of the data file (the original file and a copy)\&. This space is
 .sp -1
 .IP \(bu 2.3
 .\}
-Space for the new index file that replaces the old one\&. The old index file is truncated at the start of the repair operation, so you usually ignore this space\&. This space must be available on the same file system as the original data file\&.
+Record format
+.sp
+The format used to store table rows\&. The preceding examples use
+Fixed length\&. Other possible values are
+Compressed
+and
+Packed\&.
 .RE
 .sp
 .RS 4
@@ -1317,30 +1480,964 @@ Space for the new index file that replaces the old one\&. The old index file is
 .sp -1
 .IP \(bu 2.3
 .\}
-When using
-\fB\-\-recover\fR
-or
-\fB\-\-sort\-recover\fR
-(but not when using
-\fB\-\-safe\-recover\fR), you need space for a sort buffer\&. The following formula yields the amount of space required:
+Chararacter set
+.sp
+The table default character set\&.
+.RE
 .sp
-.if n \{\
 .RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
 .\}
-.nf
-(\fIlargest_key\fR + \fIrow_pointer_length\fR) \(mu \fInumber_of_rows\fR \(mu 2
-.fi
-.if n \{\
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+File\-version
+.sp
+Version of
+MyISAM
+format\&. Currently always 1\&.
 .RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
 .\}
+Creation time
 .sp
-You can check the length of the keys and the
-row_pointer_length
-with
-\fBmyisamchk \-dv \fR\fB\fItbl_name\fR\fR\&. This space is allocated in the temporary directory (specified by
-TMPDIR
-or
-\fB\-\-tmpdir=\fR\fB\fIpath\fR\fR)\&.
+When the data file was created\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Recover time
+.sp
+When the index/data file was last reconstructed\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Status
+.sp
+Table status flags\&. Possible values are
+crashed,
+open,
+changed,
+analyzed,
+optimized keys, and
+sorted index pages\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Auto increment key,
+Last value
+.sp
+The key number associated the table\'s
+AUTO_INCREMENT
+column, and the most recently generated value for this column\&. These fields do not appear if there is no such column\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Data records
+.sp
+The number of rows in the table\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Deleted blocks
+.sp
+How many deleted blocks still have reserved space\&. You can optimize your table to minimize this space\&. See
+Section\ \&6.4.4, \(lqTable Optimization\(rq\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Datafile parts
+.sp
+For dynamic\-row format, this indicates how many data blocks there are\&. For an optimized table without fragmented rows, this is the same as
+Data records\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Deleted data
+.sp
+How many bytes of unreclaimed deleted data there are\&. You can optimize your table to minimize this space\&. See
+Section\ \&6.4.4, \(lqTable Optimization\(rq\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Datafile pointer
+.sp
+The size of the data file pointer, in bytes\&. It is usually 2, 3, 4, or 5 bytes\&. Most tables manage with 2 bytes, but this cannot be controlled from MySQL yet\&. For fixed tables, this is a row address\&. For dynamic tables, this is a byte address\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Keyfile pointer
+.sp
+The size of the index file pointer, in bytes\&. It is usually 1, 2, or 3 bytes\&. Most tables manage with 2 bytes, but this is calculated automatically by MySQL\&. It is always a block address\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Max datafile length
+.sp
+How long the table data file can become, in bytes\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Max keyfile length
+.sp
+How long the table index file can become, in bytes\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Recordlength
+.sp
+How much space each row takes, in bytes\&.
+.RE
+.PP
+The
+table description
+part of the output includes a list of all keys in the table\&. For each key,
+\fBmyisamchk\fR
+displays some low\-level information:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Key
+.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
+table description
+lines for the second index\&. This indicates that it is a multiple\-part index with two parts\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Start
+.sp
+Where in the row this portion of the index starts\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Len
+.sp
+How long this portion of the index is\&. For packed numbers, this should always be the full length of the column\&. For strings, it may be shorter than the full length of the indexed column, because you can index a prefix of a string column\&. The total length of a multiple\-part key is the sum of the
+Len
+values for all key parts\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Index
+.sp
+Whether a key value can exist multiple times in the index\&. Possible values are
+unique
+or
+multip\&.
+(multiple)\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Type
+.sp
+What data type this portion of the index has\&. This is a
+MyISAM
+data type with the possible values
+packed,
+stripped, or
+empty\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Root
+.sp
+Address of the root index block\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Blocksize
+.sp
+The size of each index block\&. By default this is 1024, but the value may be changed at compile time when MySQL is built from source\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Rec/key
+.sp
+This is a statistical value used by the optimizer\&. It tells how many rows there are per value for this index\&. A unique index always has a value of 1\&. This may be updated after a table is loaded (or greatly changed) with
+\fBmyisamchk \-a\fR\&. If this is not updated at all, a default value of 30 is given\&.
+.RE
+.PP
+The last part of the output provides information about each column:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Field
+.sp
+The column number\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Start
+.sp
+The byte position of the column within table rows\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Length
+.sp
+The length of the column in bytes\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Nullpos,
+Nullbit
+.sp
+For columns that can be
+NULL,
+MyISAM
+stores
+NULL
+values as a flag in a byte\&. Depending on how many nullable columns there are, there can be one or more bytes used for this purpose\&. The
+Nullpos
+and
+Nullbit
+values, if nonempty, indicate which byte and bit contains that flag indicating whether the column is
+NULL\&.
+.sp
+The position and number of bytes used to store
+NULL
+flags is shown in the line for field 1\&. This is why there are six
+Field
+lines for the
+person
+table even though it has only five columns\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Type
+.sp
+The data type\&. The value may contain any of the following descriptors:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+constant
+.sp
+All rows have the same value\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+no endspace
+.sp
+Do not store endspace\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+no endspace, not_always
+.sp
+Do not store endspace and do not do endspace compression for all values\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+no endspace, no empty
+.sp
+Do not store endspace\&. Do not store empty values\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+table\-lookup
+.sp
+The column was converted to an
+ENUM\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+zerofill(\fIN\fR)
+.sp
+The most significant
+\fIN\fR
+bytes in the value are always 0 and are not stored\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+no zeros
+.sp
+Do not store zeros\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+always zero
+.sp
+Zero values are stored using one bit\&.
+.RE
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Huff tree
+.sp
+The number of the Huffman tree associated with the column\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Bits
+.sp
+The number of bits used in the Huffman tree\&.
+.RE
+.PP
+The
+Huff tree
+and
+Bits
+fields are displayed if the table has been compressed with
+\fBmyisampack\fR\&. See
+\fBmyisampack\fR(1), for an example of this information\&.
+.PP
+Example of
+\fBmyisamchk \-eiv\fR
+output:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+Checking MyISAM file: person
+Data records:  306688   Deleted blocks:       0
+\- check file\-size
+\- check record delete\-chain
+No recordlinks
+\- check key delete\-chain
+block_size 1024:
+\- check index reference
+\- check data record references index: 1
+Key:  1:  Keyblocks used:  98%  Packed:    0%  Max levels:  3
+\- check data record references index: 2
+Key:  2:  Keyblocks used:  99%  Packed:   97%  Max levels:  3
+\- check data record references index: 3
+Key:  3:  Keyblocks used:  98%  Packed:  \-14%  Max levels:  3
+Total:    Keyblocks used:  98%  Packed:   89%
+\- check records and index references
+\fI*** LOTS OF ROW NUMBERS DELETED ***\fR
+Records:            306688  M\&.recordlength:       25  Packed:            83%
+Recordspace used:       97% Empty space:           2% Blocks/Record:   1\&.00
+Record blocks:      306688  Delete blocks:         0
+Record data:       7934464  Deleted data:          0
+Lost space:         256512  Linkdata:        1156096
+User time 43\&.08, System time 1\&.68
+Maximum resident set size 0, Integral resident set size 0
+Non\-physical pagefaults 0, Physical pagefaults 0, Swaps 0
+Blocks in 0 out 7, Messages in 0 out 0, Signals 0
+Voluntary context switches 0, Involuntary context switches 0
+Maximum memory usage: 1046926 bytes (1023k)
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+\fBmyisamchk \-eiv\fR
+output includes the following information:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Data records
+.sp
+The number of rows in the table\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Deleted blocks
+.sp
+How many deleted blocks still have reserved space\&. You can optimize your table to minimize this space\&. See
+Section\ \&6.4.4, \(lqTable Optimization\(rq\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Key
+.sp
+The key number\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Keyblocks used
+.sp
+What percentage of the keyblocks are used\&. When a table has just been reorganized with
+\fBmyisamchk\fR, the values are very high (very near theoretical maximum)\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Packed
+.sp
+MySQL tries to pack key values that have a common suffix\&. This can only be used for indexes on
+CHAR
+and
+VARCHAR
+columns\&. For long indexed strings that have similar leftmost parts, this can significantly reduce the space used\&. In the preceding example, the second key is 40 bytes long and a 97% reduction in space is achieved\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Max levels
+.sp
+How deep the B\-tree for this key is\&. Large tables with long key values get high values\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Records
+.sp
+How many rows are in the table\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+M\&.recordlength
+.sp
+The average row length\&. This is the exact row length for tables with fixed\-length rows, because all rows have the same length\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Packed
+.sp
+MySQL strips spaces from the end of strings\&. The
+Packed
+value indicates the percentage of savings achieved by doing this\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Recordspace used
+.sp
+What percentage of the data file is used\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Empty space
+.sp
+What percentage of the data file is unused\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Blocks/Record
+.sp
+Average number of blocks per row (that is, how many links a fragmented row is composed of)\&. This is always 1\&.0 for fixed\-format tables\&. This value should stay as close to 1\&.0 as possible\&. If it gets too large, you can reorganize the table\&. See
+Section\ \&6.4.4, \(lqTable Optimization\(rq\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Recordblocks
+.sp
+How many blocks (links) are used\&. For fixed\-format tables, this is the same as the number of rows\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Deleteblocks
+.sp
+How many blocks (links) are deleted\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Recorddata
+.sp
+How many bytes in the data file are used\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Deleted data
+.sp
+How many bytes in the data file are deleted (unused)\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Lost space
+.sp
+If a row is updated to a shorter length, some space is lost\&. This is the sum of all such losses, in bytes\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Linkdata
+.sp
+When the dynamic table format is used, row fragments are linked with pointers (4 to 7 bytes each)\&.
+Linkdata
+is the sum of the amount of storage used by all such pointers\&.
+.RE
+.SH "MYISAMCHK MEMORY USAGE"
+.\" memory usage: myisamchk
+.PP
+Memory allocation is important when you run
+\fBmyisamchk\fR\&.
+\fBmyisamchk\fR
+uses no more memory than its memory\-related variables are set to\&. If you are going to use
+\fBmyisamchk\fR
+on very large tables, you should first decide how much memory you want it to use\&. The default is to use only about 3MB to perform repairs\&. By using larger values, you can get
+\fBmyisamchk\fR
+to operate faster\&. For example, if you have more than 32MB RAM, you could use options such as these (in addition to any other options you might specify):
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+shell> \fBmyisamchk \-\-sort_buffer_size=16M \e\fR
+           \fB\-\-key_buffer_size=16M \e\fR
+           \fB\-\-read_buffer_size=1M \e\fR
+           \fB\-\-write_buffer_size=1M \&.\&.\&.\fR
+.fi
+.if n \{\
+.RE
+.\}
+.PP
+Using
+\fB\-\-sort_buffer_size=16M\fR
+should probably be enough for most cases\&.
+.PP
+Be aware that
+\fBmyisamchk\fR
+uses temporary files in
+TMPDIR\&. If
+TMPDIR
+points to a memory file system, out of memory errors can easily occur\&. If this happens, run
+\fBmyisamchk\fR
+with the
+\fB\-\-tmpdir=\fR\fB\fIpath\fR\fR
+option to specify a directory located on a file system that has more space\&.
+.PP
+When performing repair operations,
+\fBmyisamchk\fR
+also needs a lot of disk space:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Twice the size of the data file (the original file and a copy)\&. This space is not needed if you do a repair with
+\fB\-\-quick\fR; in this case, only the index file is re\-created\&.
+\fIThis space must be available on the same file system as the original data file\fR, as the copy is created in the same directory as the original\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+Space for the new index file that replaces the old one\&. The old index file is truncated at the start of the repair operation, so you usually ignore this space\&. This space must be available on the same file system as the original data file\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+When using
+\fB\-\-recover\fR
+or
+\fB\-\-sort\-recover\fR
+(but not when using
+\fB\-\-safe\-recover\fR), you need space on disk for sorting\&. This space is allocated in the temporary directory (specified by
+TMPDIR
+or
+\fB\-\-tmpdir=\fR\fB\fIpath\fR\fR)\&. The following formula yields the amount of space required:
+.sp
+.if n \{\
+.RS 4
+.\}
+.nf
+(\fIlargest_key\fR + \fIrow_pointer_length\fR) \(mu \fInumber_of_rows\fR \(mu 2
+.fi
+.if n \{\
+.RE
+.\}
+.sp
+You can check the length of the keys and the
+\fIrow_pointer_length\fR
+with
+\fBmyisamchk \-dv \fR\fB\fItbl_name\fR\fR
+(see
+the section called \(lqMYISAMCHK TABLE INFORMATION\(rq)\&. The
+\fIrow_pointer_length\fR
+and
+\fInumber_of_rows\fR
+values are the
+Datafile pointer
+and
+Data records
+values in the table description\&. To determine the
+\fIlargest_key\fR
+value, check the
+Key
+lines in the table description\&. The
+Len
+column indicates the number of bytes for each key part\&. For a multiple\-column index, the key size is the sum of the
+Len
+values for all key parts\&.
 .RE
 .PP
 If you have a problem with disk space during repair, you can try

man/myisamlog.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisamlog\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYISAMLOG\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYISAMLOG\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/myisampack.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmyisampack\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYISAMPACK\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYISAMPACK\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -652,9 +652,11 @@ After join
 The number of distinct Huffman trees left after joining trees to save some header space\&.
 .RE
 .PP
-After a table has been compressed,
+After a table has been compressed, the
+Field
+lines displayed by
 \fBmyisamchk \-dvv\fR
-prints additional information about each column:
+include additional information about each column:
 .sp
 .RS 4
 .ie n \{\

man/mysql-stress-test.pl.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql-stress-test.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/08/2009
+.\"      Date: 10/29/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-STRESS\-TE" "1" "08/08/2009" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-STRESS\-TE" "1" "10/29/2009" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysql-test-run.pl.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql-test-run.pl\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/08/2009
+.\"      Date: 10/29/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\-TEST\-RUN\" "1" "08/08/2009" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL\-TEST\-RUN\" "1" "10/29/2009" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -700,6 +700,9 @@ Specify a file that contains a list of test cases that should be displayed with
 code rather than
 [ fail ]
 if they fail\&. This option was added in MySQL 5\&.1\&.33/6\&.0\&.11\&.
+.sp
+For an example of a file that might be specified via this option, see
+mysql\-test/collections/default\&.experimental\&.
 .RE
 .sp
 .RS 4
@@ -1132,6 +1135,26 @@ not to generate a timing file\&.
 .sp -1
 .IP \(bu 2.3
 .\}
+.\" mysql-test-run.pl: parallel option
+.\" parallel option: mysql-test-run.pl
+\fB\-\-parallel={\fR\fB\fIN\fR\fR\fB|auto}\fR
+.sp
+Run tests using
+\fIN\fR
+parallel threads\&. By default, 1 thread is used\&. Use
+\fB\-\-parallel=auto\fR
+for auto\-setting of
+\fIN\fR\&. This option was added in MySQL 5\&.1\&.36\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .\" mysql-test-run.pl: ps-protocol option
 .\" ps-protocol option: mysql-test-run.pl
 \fB\-\-ps\-protocol\fR

man/mysql.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -334,8 +334,18 @@ to display result set metadata\&.
 .sp
 Use
 \fIcharset_name\fR
-as the default character set\&. See
-Section\ \&9.2, \(lqThe Character Set Used for Data and Sorting\(rq\&.
+as the default character set for the client and connection\&.
+.sp
+A common issue that can occur when the operating system uses
+utf8
+or another multi\-byte character set is that output from the
+\fBmysql\fR
+client is formatted incorrectly, due to the fact that the MySQL client uses the
+latin1
+character set by default\&. You can usually fix such issues by using this option to force the client to use the system character set instead\&.
+.sp
+See
+Section\ \&9.2, \(lqThe Character Set Used for Data and Sorting\(rq, for more information\&.
 .RE
 .sp
 .RS 4
@@ -648,7 +658,7 @@ PAGER
 environment variable\&. Valid pagers are
 \fBless\fR,
 \fBmore\fR,
-\fBcat [> filename]\fR, and so forth\&. This option works only on Unix\&. It does not work in batch mode\&. To disable paging, use
+\fBcat [> filename]\fR, and so forth\&. This option works only on Unix and only in interactive mode\&. To disable paging, use
 \fB\-\-skip\-pager\fR\&.
 the section called \(lqMYSQL COMMANDS\(rq, discusses output paging further\&.
 .RE
@@ -1026,7 +1036,7 @@ Display output in table format\&. This is the default for interactive use, but c
 .\" tee option: mysql
 \fB\-\-tee=\fR\fB\fIfile_name\fR\fR
 .sp
-Append a copy of output to the given file\&. This option does not work in batch mode\&.
+Append a copy of output to the given file\&. This option works only in interactive mode\&.
 the section called \(lqMYSQL COMMANDS\(rq, discusses tee files further\&.
 .RE
 .sp
@@ -1523,7 +1533,7 @@ is set to something other than the default of
 \(lq;\(rq, instances of that character are sent to the server without interpretation\&. However, the server itself still interprets
 \(lq;\(rq
 as a statement delimiter and processes statements accordingly\&. This behavior on the server side comes into play for multiple\-statement execution (see
-Section\ \&21.10.12, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see
+Section\ \&21.9.12, \(lqC API Support for Multiple Statement Execution\(rq), and for parsing the body of stored procedures and functions, triggers, and events (see
 Section\ \&19.1, \(lqDefining Stored Programs\(rq)\&.
 .RE
 .sp
@@ -1680,7 +1690,7 @@ option when you invoke
 \fBmysql\fR
 checks the value of the
 PAGER
-environment variable and sets the pager to that\&.
+environment variable and sets the pager to that\&. Pager functionality works only in interactive mode\&.
 .sp
 Output paging can be enabled interactively with the
 \fBpager\fR
@@ -1853,7 +1863,7 @@ By using the
 option when you invoke
 \fBmysql\fR, you can log statements and their output\&. All the data displayed on the screen is appended into a given file\&. This can be very useful for debugging purposes also\&.
 \fBmysql\fR
-flushes results to the file after each statement, just before it prints its next prompt\&.
+flushes results to the file after each statement, just before it prints its next prompt\&. Tee functionality works only in interactive mode\&.
 .sp
 You can enable this feature interactively with the
 \fBtee\fR
@@ -2334,7 +2344,7 @@ prompt=(\e\eu@\e\eh) [\e\ed]>\e\e_
 .sp
 In this example, note that the backslashes are doubled\&. If you set the prompt using the
 prompt
-option in an option file, it is advisable to double the backslashes when using the special prompt options\&. There is some overlap in the set of allowable prompt options and the set of special escape sequences that are recognized in option files\&. (These sequences are listed in
+option in an option file, it is advisable to double the backslashes when using the special prompt options\&. There is some overlap in the set of allowable prompt options and the set of special escape sequences that are recognized in option files\&. (The rules for escape sequences in option files are listed in
 Section\ \&4.2.3.3, \(lqUsing Option Files\(rq\&.) The overlap may cause you problems if you use single backslashes\&. For example,
 \es
 is interpreted as a space rather than as the current seconds value\&. The following example shows how to define a prompt within an option file to include the current time in
@@ -2586,6 +2596,12 @@ SELECT \'<info_to_display>\' AS \' \';
 The statement shown outputs
 <info_to_display>\&.
 .PP
+You can also invoke
+\fBmysql\fR
+with the
+\fB\-\-verbose\fR
+option, which causes each statement to be displayed before the result that it produces\&.
+.PP
 As of MySQL 5\&.1\&.23,
 \fBmysql\fR
 ignores Unicode byte order mark (BOM) characters at the beginning of input files\&. Previously, it read them and sent them to the server, resulting in a syntax error\&. Presence of a BOM does not cause
@@ -2785,7 +2801,7 @@ client with the
 option\&.
 .PP
 For more information about auto\-reconnect and its effect on state information when a reconnection occurs, see
-Section\ \&21.10.11, \(lqControlling Automatic Reconnection Behavior\(rq\&.
+Section\ \&21.9.11, \(lqControlling Automatic Reconnection Behavior\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP

man/mysql.server.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql.server\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL\&.SERVER\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL\&.SERVER\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -40,7 +40,7 @@ script will be installed in the
 /etc/init\&.d
 directory with the name
 mysql\&. You need not install it manually\&. See
-Section\ \&2.4, \(lqInstalling MySQL from RPM Packages on Linux\(rq, for more information on the Linux RPM packages\&.
+Section\ \&2.6.1, \(lqInstalling MySQL from RPM Packages on Linux\(rq, for more information on the Linux RPM packages\&.
 .PP
 Some vendors provide RPM packages that install a startup script under a different name such as
 \fBmysqld\fR\&.
@@ -48,7 +48,7 @@ Some vendors provide RPM packages that install a startup script under a differen
 If you install MySQL from a source distribution or using a binary distribution format that does not install
 \fBmysql\&.server\fR
 automatically, you can install it manually\&. Instructions are provided in
-Section\ \&2.11.2.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.
+Section\ \&2.13.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.
 .PP
 \fBmysql\&.server\fR
 reads options from the

man/mysql_client_test.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_client_test\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/08/2009
+.\"      Date: 10/29/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CLIENT_TEST" "1" "08/08/2009" "MySQL" "MySQL Database System"
+.TH "\FBMYSQL_CLIENT_TEST" "1" "10/29/2009" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysql_config.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_config\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONFIG\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_CONFIG\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysql_convert_table_format.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_convert_table_format\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_CONVERT_TAB" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_CONVERT_TAB" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysql_find_rows.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_find_rows\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIND_ROWS\F" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_FIND_ROWS\F" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysql_fix_extensions.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_fix_extensions\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIX_EXTENSI" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_FIX_EXTENSI" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysql_fix_privilege_tables.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_fix_privilege_tables\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_FIX_PRIVILE" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_FIX_PRIVILE" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysql_install_db.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_install_db\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_INSTALL_DB\" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_INSTALL_DB\" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -81,7 +81,7 @@ with the
 and
 \fB\-\-skip\-grant\-tables\fR
 options (see
-Section\ \&2.10.2, \(lqTypical configure Options\(rq)\&. If MySQL was configured with the
+Section\ \&2.3.2, \(lqTypical configure Options\(rq)\&. If MySQL was configured with the
 \fB\-\-disable\-grant\-options\fR
 option,
 \fB\-\-bootstrap\fR

man/mysql_secure_installation.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_secure_installation\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SECURE_INST" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_SECURE_INST" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysql_setpermission.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_setpermission\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_SETPERMISSI" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_SETPERMISSI" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysql_tzinfo_to_sql.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_tzinfo_to_sql\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_TZINFO_TO_S" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_TZINFO_TO_S" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysql_upgrade.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_upgrade\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_UPGRADE\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_UPGRADE\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -41,7 +41,7 @@ script, which should no longer be used\&.
 If a table is found to have a possible incompatibility,
 \fBmysql_upgrade\fR
 performs a table check\&. If any problems are found, a table repair is attempted\&. If the table cannot be repaired, see
-Section\ \&2.12.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
+Section\ \&2.4.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
 for manual table repair strategies\&.
 .if n \{\
 .sp
@@ -59,11 +59,11 @@ for manual table repair strategies\&.
 You should always back up your current MySQL installation
 \fIbefore\fR
 performing an upgrade\&. See
-Section\ \&6.1, \(lqDatabase Backups\(rq\&.
+Section\ \&6.1, \(lqDatabase Backup Methods\(rq\&.
 .PP
 Some upgrade incompatibilities may require special handling before you upgrade your MySQL installation and run
 \fBmysql_upgrade\fR\&. See
-Section\ \&2.12.1, \(lqUpgrading MySQL\(rq, for instructions on determining whether any such incompatibilities apply to your installation and how to handle them\&.
+Section\ \&2.4.1, \(lqUpgrading MySQL\(rq, for instructions on determining whether any such incompatibilities apply to your installation and how to handle them\&.
 .sp .5v
 .RE
 .PP
@@ -189,7 +189,7 @@ If you install MySQL from RPM packages on Linux, you must install the server and
 \fBmysql_upgrade\fR
 is included in the server RPM but requires the client RPM because the latter includes
 \fBmysqlcheck\fR\&. (See
-Section\ \&2.4, \(lqInstalling MySQL from RPM Packages on Linux\(rq\&.)
+Section\ \&2.6.1, \(lqInstalling MySQL from RPM Packages on Linux\(rq\&.)
 .PP
 In MySQL 5\&.1\&.7,
 \fBmysql_upgrade \fR
@@ -352,6 +352,26 @@ root\&.
 .sp
 Verbose mode\&. Print more information about what the program does\&.
 .RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
+.\" mysql_upgrade: write-binlog option
+.\" write-binlog option: mysql_upgrade
+\fB\-\-write\-binlog\fR
+.sp
+Cause binary logging to be enabled while
+\fBmysql_upgrade\fR
+runs\&. This is the default behavior; to disable binary logging during the upgrade, use the inverse of this option (that is, start the program with
+\fB\-\-skip\-write\-binlog\fR)\&.
+.sp
+This option was introduced in MySQL 5\&.1\&.40\&.
+.RE
 .SH "COPYRIGHT"
 .br
 .PP

man/mysql_waitpid.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_waitpid\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_WAITPID\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_WAITPID\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysql_zap.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysql_zap\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQL_ZAP\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQL_ZAP\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysqlaccess.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlaccess\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLACCESS\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLACCESS\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysqladmin.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqladmin\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLADMIN\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLADMIN\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysqlbinlog.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlbinlog\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBINLOG\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLBINLOG\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -855,7 +855,7 @@ You can pipe the output of
 into the
 \fBmysql\fR
 client to execute the statements contained in the binary log\&. This is used to recover from a crash when you have an old backup (see
-Section\ \&6.1, \(lqDatabase Backups\(rq)\&. For example:
+Section\ \&6.1, \(lqDatabase Backup Methods\(rq)\&. For example:
 .sp
 .if n \{\
 .RS 4

man/mysqlbug.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlbug\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLBUG\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLBUG\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysqlcheck.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlcheck\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLCHECK\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLCHECK\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -34,7 +34,14 @@ The
 \fBmysqlcheck\fR
 client performs table maintenance: It checks, repairs, optimizes, or analyzes tables\&.
 .PP
-Each table is locked and therefore unavailable to other sessions while it is being processed\&. Table maintenance operations can be time\-consuming, particularly for large tables\&. If you use the
+Each table is locked and therefore unavailable to other sessions while it is being processed, although for check operations, the table is locked with a
+READ
+lock only (see
+Section\ \&12.4.5, \(lqLOCK TABLES and UNLOCK TABLES Syntax\(rq, for more information about
+READ
+and
+WRITE
+locks)\&. Table maintenance operations can be time\-consuming, particularly for large tables\&. If you use the
 \fB\-\-databases\fR
 or
 \fB\-\-all\-databases\fR
@@ -94,7 +101,7 @@ note     : The storage engine for the table doesn\'t support check
 If
 \fBmysqlcheck\fR
 is unable to repair a table, see
-Section\ \&2.12.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
+Section\ \&2.4.4, \(lqRebuilding or Repairing Tables or Indexes\(rq
 for manual table repair strategies\&. This will be the case, for example, for
 InnoDB
 tables, which can be checked with

man/mysqld.8

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD\FR" "8" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLD\FR" "8" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysqld_multi.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld_multi\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_MULTI\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLD_MULTI\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -51,7 +51,7 @@ to specify which servers you want to start, stop, or obtain a status report for\
 [mysqld]
 group used for starting
 \fBmysqld\fR\&. (See, for example,
-Section\ \&2.11.2.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.) However, when using multiple servers, it is necessary that each one use its own value for options such as the Unix socket file and TCP/IP port number\&. For more information on which options must be unique per server in a multiple\-server environment, see
+Section\ \&2.13.1.2, \(lqStarting and Stopping MySQL Automatically\(rq\&.) However, when using multiple servers, it is necessary that each one use its own value for options such as the Unix socket file and TCP/IP port number\&. For more information on which options must be unique per server in a multiple\-server environment, see
 Section\ \&5.6, \(lqRunning Multiple MySQL Servers on the Same Machine\(rq\&.
 .PP
 To invoke
@@ -183,12 +183,6 @@ Otherwise, option files in the standard list of locations are read, including an
 option, if one is given\&. (If the option is given multiple times, the last value is used\&.)
 .RE
 .PP
-Option files read are searched for
-[mysqld_multi]
-and
-[mysqld\fIN\fR]
-option groups\&.
-.PP
 Before MySQL 5\&.1\&.18, the preceding options are not recognized\&. Files in the standard locations are read, and any file named by the
 \fB\-\-config\-file=\fR\fB\fIfile_name\fR\fR
 option, if one is given\&. A file named by
@@ -199,6 +193,39 @@ option groups, not the
 [mysqld_multi]
 group\&.
 .PP
+Option files read are searched for
+[mysqld_multi]
+and
+[mysqld\fIN\fR]
+option groups\&. The
+[mysqld_multi]
+group can be used for options to
+\fBmysqld_multi\fR
+itself\&.
+[mysqld\fIN\fR]
+groups can be used for options passed to specific
+\fBmysqld\fR
+instances\&.
+.PP
+As of MySQL 5\&.1\&.35, the
+[mysqld]
+or
+[mysqld_safe]
+groups can be used for common options read by all instances of
+\fBmysqld\fR
+or
+\fBmysqld_safe\fR\&. You can specify a
+\fB\-\-defaults\-file=\fR\fB\fIfile_name\fR\fR
+option to use a different configuration file for that instance, in which case the
+[mysqld]
+or
+[mysqld_safe]
+groups from that file will be used for that instance\&. Before MySQL 5\&.1\&.35, some versions of
+\fBmysqld_multi\fR
+pass the
+\fB\-\-no\-defaults\fR
+options to instances, so these techniques are inapplicable\&.
+.PP
 \fBmysqld_multi\fR
 supports the following options:
 .sp

man/mysqld_safe.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqld_safe\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLD_SAFE\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLD_SAFE\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysqldump.1

@@ -2,12 +2,12 @@
 .\"     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: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMP\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLDUMP\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -575,7 +575,7 @@ uses
 utf8, and earlier versions use
 latin1\&.
 .sp
-This option has no effect for output data files produced by using the
+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
@@ -1232,7 +1232,8 @@ statement for the table\&.
 \fB\-\-no\-set\-names\fR
 .sp
 This option is deprecated\&. Use
-\fB\-\-skip\-set\-charset\fR\&. instead\&.
+\fB\-\-skip\-set\-charset\fR
+instead\&.
 .RE
 .sp
 .RS 4
@@ -1657,11 +1658,11 @@ and
 \fB\-\-lines\-terminated\-by\fR
 options\&.
 .sp
-Column values are dumped using the
-binary
-character set and the
+As of MySQL 5\&.1\&.38, column values are written converted to the character set specified by the
 \fB\-\-default\-character\-set\fR
-option is ignored\&. 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\&. 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\&.
 .if n \{\
 .sp
 .\}
@@ -2110,7 +2111,7 @@ InnoDB
 storage engine\&.
 .PP
 For more information on making backups, see
-Section\ \&6.1, \(lqDatabase Backups\(rq, and
+Section\ \&6.1, \(lqDatabase Backup Methods\(rq, and
 Section\ \&6.2, \(lqExample Backup and Recovery Strategy\(rq\&.
 .\" mysqldump: views
 .\" mysqldump: problems

man/mysqldumpslow.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqldumpslow\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLDUMPSLOW\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLDUMPSLOW\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysqlhotcopy.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlhotcopy\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLHOTCOPY\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLHOTCOPY\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysqlimport.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlimport\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLIMPORT\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLIMPORT\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysqlmanager.8

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlmanager\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLMANAGER\FR" "8" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLMANAGER\FR" "8" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -274,7 +274,8 @@ Drop all users from the password file\&. This option was added in MySQL 5\&.1\&.
 .\}
 .\" mysqlmanager: debug option
 .\" debug option: mysqlmanager
-\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR\fB, \-# \fR\fB\fIdebug_options\fR\fR
+\fB\-\-debug=\fR\fB\fIdebug_options\fR\fR,
+\fB\-# \fR\fB\fIdebug_options\fR\fR
 .sp
 Write a debugging log\&. A typical
 \fIdebug_options\fR

man/mysqlshow.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlshow\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSHOW\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLSHOW\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysqlslap.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqlslap\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBMYSQLSLAP\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBMYSQLSLAP\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/mysqltest.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBmysqltest\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/08/2009
+.\"      Date: 10/29/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL
 .\"  Language: English
 .\"
-.TH "\FBMYSQLTEST\FR" "1" "08/08/2009" "MySQL" "MySQL Database System"
+.TH "\FBMYSQLTEST\FR" "1" "10/29/2009" "MySQL" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/ndbd.8

@@ -2,12 +2,12 @@
 .\"     Title: \fBndbd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBNDBD\FR" "8" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBNDBD\FR" "8" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -41,8 +41,9 @@ processes cooperate in handling data\&. These processes can execute on the same
 .\" command options (MySQL Cluster): ndbd
 .\" MySQL Cluster: ndbd process
 .PP
-The following list describes command options specific to the MySQL Cluster data node program
-\fBndbd\fR\&.
+The following table includes command options specific to the MySQL Cluster data node program
+\fBndbd\fR\&. Additional descriptions follow the table\&. For options common to all MySQL Cluster programs, see
+Section\ \&17.4.2, \(lqOptions Common to MySQL Cluster Programs\(rq\&.
 .if n \{\
 .sp
 .\}
@@ -68,7 +69,7 @@ wherever the latter occurs in this section\&.
 For options common to all
 NDBCLUSTER
 programs, see
-Section\ \&17.6.2, \(lqOptions Common to MySQL Cluster Programs\(rq\&.
+Section\ \&17.4.2, \(lqOptions Common to MySQL Cluster Programs\(rq\&.
 .sp
 .RS 4
 .ie n \{\
@@ -81,9 +82,11 @@ Section\ \&17.6.2, \(lqOptions Common to MySQL Cluster Programs\(rq\&.
 \fB\-\-bind\-address\fR
 .TS
 allbox tab(:);
-l l
-l l
-l l.
+l l s
+l l s
+l l s
+^ l l
+^ l l.
 T{
 \fBVersion Introduced\fR
 T}:T{
@@ -95,28 +98,16 @@ T}:T{
 \-\-bind\-address=name
 T}
 T{
-\fBPermitted Values \fR
+\ \&
 T}:T{
-[\fInested\ table\fR]*
+\fBPermitted Values \fR
 T}
-.TE
-.sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B *[nested\ table]
-.TS
-allbox tab(:);
-l l
-l l.
-T{
+:T{
 \fBType\fR
 T}:T{
 string
 T}
-T{
+:T{
 \fBDefault\fR
 T}:T{
 T}
@@ -141,36 +132,26 @@ This option was added in MySQL 5\&.1\&.12\&.
 \fB\-d\fR
 .TS
 allbox tab(:);
-l l
-l l.
+l l s
+l l s
+^ l l
+^ l l.
 T{
 \fBCommand Line Format\fR
 T}:T{
 \-\-daemon
 T}
 T{
-\fBPermitted Values \fR
+\ \&
 T}:T{
-[\fInested\ table\fR]*
+\fBPermitted Values \fR
 T}
-.TE
-.sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B *[nested\ table]
-.TS
-allbox tab(:);
-l l
-l l.
-T{
+:T{
 \fBType\fR
 T}:T{
 boolean
 T}
-T{
+:T{
 \fBDefault\fR
 T}:T{
 TRUE
@@ -182,6 +163,12 @@ Instructs
 to execute as a daemon process\&. This is the default behavior\&.
 \fB\-\-nodaemon\fR
 can be used to prevent the process from running as a daemon\&.
+.sp
+This option has no effect when running
+\fBndbd\fR
+or
+\fBndbmtd\fR
+on Windows platforms\&.
 .RE
 .sp
 .RS 4
@@ -197,36 +184,26 @@ can be used to prevent the process from running as a daemon\&.
 \fB\-\-initial\fR
 .TS
 allbox tab(:);
-l l
-l l.
+l l s
+l l s
+^ l l
+^ l l.
 T{
 \fBCommand Line Format\fR
 T}:T{
 \-\-initial
 T}
 T{
-\fBPermitted Values \fR
+\ \&
 T}:T{
-[\fInested\ table\fR]*
+\fBPermitted Values \fR
 T}
-.TE
-.sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B *[nested\ table]
-.TS
-allbox tab(:);
-l l
-l l.
-T{
+:T{
 \fBType\fR
 T}:T{
 boolean
 T}
-T{
+:T{
 \fBDefault\fR
 T}:T{
 FALSE
@@ -321,9 +298,11 @@ Backup files that have already been created by the affected node
 .IP \(bu 2.3
 .\}
 MySQL Cluster Disk Data files (see
-Section\ \&17.10, \(lqMySQL Cluster Disk Data Tables\(rq)\&.
+Section\ \&17.5.9, \(lqMySQL Cluster Disk Data Tables\(rq)\&.
 .RE
 .RS 4
+.sp
+This option also has no effect on recovery of data by a data node that is just starting (or restarting) from data nodes that are already running\&. This recovery of data occurs automatically, and requires no user intervention in a MySQL Cluster that is running normally\&.
 .sp .5v
 .RE
 It is permissible to use this option when starting the cluster for the very first time (that is, before any data node files have been created); however, it is
@@ -344,9 +323,11 @@ necessary to do so\&.
 \fB\-\-initial\-start\fR
 .TS
 allbox tab(:);
-l l
-l l
-l l.
+l l s
+l l s
+l l s
+^ l l
+^ l l.
 T{
 \fBVersion Introduced\fR
 T}:T{
@@ -358,28 +339,16 @@ T}:T{
 \-\-initial\-start
 T}
 T{
-\fBPermitted Values \fR
+\ \&
 T}:T{
-[\fInested\ table\fR]*
+\fBPermitted Values \fR
 T}
-.TE
-.sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B *[nested\ table]
-.TS
-allbox tab(:);
-l l
-l l.
-T{
+:T{
 \fBType\fR
 T}:T{
 boolean
 T}
-T{
+:T{
 \fBDefault\fR
 T}:T{
 FALSE
@@ -435,9 +404,11 @@ Prior to MySQL 5\&.1\&.19, it was not possible to perform DDL operations involvi
 \fB\-\-nowait\-nodes=\fR\fB\fInode_id_1\fR\fR\fB[, \fR\fB\fInode_id_2\fR\fR\fB[, \&.\&.\&.]]\fR
 .TS
 allbox tab(:);
-l l
-l l
-l l.
+l l s
+l l s
+l l s
+^ l l
+^ l l.
 T{
 \fBVersion Introduced\fR
 T}:T{
@@ -449,28 +420,16 @@ T}:T{
 \-\-nowait\-nodes=list
 T}
 T{
-\fBPermitted Values \fR
+\ \&
 T}:T{
-[\fInested\ table\fR]*
+\fBPermitted Values \fR
 T}
-.TE
-.sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B *[nested\ table]
-.TS
-allbox tab(:);
-l l
-l l.
-T{
+:T{
 \fBType\fR
 T}:T{
 string
 T}
-T{
+:T{
 \fBDefault\fR
 T}:T{
 T}
@@ -508,36 +467,26 @@ This option was added in MySQL 5\&.1\&.9\&.
 \fB\-\-nodaemon\fR
 .TS
 allbox tab(:);
-l l
-l l.
+l l s
+l l s
+^ l l
+^ l l.
 T{
 \fBCommand Line Format\fR
 T}:T{
 \-\-nodaemon
 T}
 T{
-\fBPermitted Values \fR
+\ \&
 T}:T{
-[\fInested\ table\fR]*
+\fBPermitted Values \fR
 T}
-.TE
-.sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B *[nested\ table]
-.TS
-allbox tab(:);
-l l
-l l.
-T{
+:T{
 \fBType\fR
 T}:T{
 boolean
 T}
-T{
+:T{
 \fBDefault\fR
 T}:T{
 FALSE
@@ -549,6 +498,12 @@ Instructs
 not to start as a daemon process\&. This is useful when
 \fBndbd\fR
 is being debugged and you want output to be redirected to the screen\&.
+.sp
+As of MySQL Cluster NDB 7\&.0\&.8, the default behavior for
+\fBndbd\fR
+and
+\fBndbmtd\fR
+on Windows is to run in the foreground, making this option unnecessary on Windows platforms\&. (\m[blue]\fBBug#45588\fR\m[]\&\s-2\u[2]\d\s+2)
 .RE
 .sp
 .RS 4
@@ -567,36 +522,26 @@ is being debugged and you want output to be redirected to the screen\&.
 \fB\-n\fR
 .TS
 allbox tab(:);
-l l
-l l.
+l l s
+l l s
+^ l l
+^ l l.
 T{
 \fBCommand Line Format\fR
 T}:T{
 \-\-nostart
 T}
 T{
-\fBPermitted Values \fR
+\ \&
 T}:T{
-[\fInested\ table\fR]*
+\fBPermitted Values \fR
 T}
-.TE
-.sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B *[nested\ table]
-.TS
-allbox tab(:);
-l l
-l l.
-T{
+:T{
 \fBType\fR
 T}:T{
 boolean
 T}
-T{
+:T{
 \fBDefault\fR
 T}:T{
 FALSE
@@ -610,7 +555,7 @@ not to start automatically\&. When this option is used,
 connects to the management server, obtains configuration data from it, and initializes communication objects\&. However, it does not actually start the execution engine until specifically requested to do so by the management server\&. This can be accomplished by issuing the proper
 START
 command in the management client (see
-Section\ \&17.7.2, \(lqCommands in the MySQL Cluster Management Client\(rq)\&.
+Section\ \&17.5.2, \(lqCommands in the MySQL Cluster Management Client\(rq)\&.
 .RE
 .\" MySQL Cluster: log files
 .\" log files (MySQL Cluster)
@@ -668,7 +613,7 @@ TraceFile: ndb_2_trace\&.log\&.2
 Listings of possible
 \fBndbd\fR
 exit codes and messages generated when a data node process shuts down prematurely can be found in
-\m[blue]\fBndbd Error Messages\fR\m[]\&\s-2\u[2]\d\s+2\&.
+\m[blue]\fBndbd Error Messages\fR\m[]\&\s-2\u[3]\d\s+2\&.
 .if n \{\
 .sp
 .\}
@@ -784,7 +729,7 @@ shell> \fBndbd \-\-connect\-string="nodeid=2;host=ndb_mgmd\&.mysql\&.com:1186"\f
 .\}
 .PP
 See
-Section\ \&17.3.4.3, \(lqThe MySQL Cluster Connectstring\(rq, for additional information about this issue\&.
+Section\ \&17.3.2.3, \(lqThe MySQL Cluster Connectstring\(rq, for additional information about this issue\&.
 \fBndbd\fR(8), describes other options for
 \fBndbd\fR\&.
 .PP
@@ -810,7 +755,7 @@ process can consume up to 2 CPUs if permitted to do so\&.
 For a machine with many CPUs it is possible to use several
 \fBndbd\fR
 processes which belong to different node groups; however, such a configuration is still considered experimental and is not supported for MySQL 5\&.1 in a production setting\&. See
-Section\ \&17.12, \(lqKnown Limitations of MySQL Cluster\(rq\&.
+Section\ \&17.1.5, \(lqKnown Limitations of MySQL Cluster\(rq\&.
 .SH "COPYRIGHT"
 .br
 .PP
@@ -829,6 +774,11 @@ Bug#24631
 \%http://bugs.mysql.com/24631
 .RE
 .IP " 2." 4
+Bug#45588
+.RS 4
+\%http://bugs.mysql.com/45588
+.RE
+.IP " 3." 4
 ndbd Error Messages
 .RS 4
 \%http://dev.mysql.com/doc/ndbapi/en/ndbd-error-messages.html

man/ndbd_redo_log_reader.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBndbd_redo_log_reader\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBNDBD_REDO_LOG_REA" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBNDBD_REDO_LOG_REA" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -37,6 +37,10 @@ The C++ source files for
 can be found in the directory
 /storage/ndb/src/kernel/blocks/dblqh/redoLogReader\&.
 .PP
+The following table includes options that are specific to the MySQL Cluster program
+\fBndbd_redo_log_reader\fR\&. Additional descriptions follow the table\&. For options common to all MySQL Cluster programs, see
+Section\ \&17.4.2, \(lqOptions Common to MySQL Cluster Programs\(rq\&.
+.PP
 \fBUsage\fR:
 .sp
 .if n \{\
@@ -56,105 +60,83 @@ ndb_\fI#\fR_fs/D\fI#\fR/LCP/\fI#\fR/T\fI#\fRF\fI#\fR\&.Data\&. In each case, the
 represents a number (not necessarily the same number)\&. For more information, see
 \m[blue]\fBCluster Data Node FileSystemDir Files\fR\m[]\&\s-2\u[1]\d\s+2\&.
 .PP
-\fBAdditional Options\fR:
+The name of the file to be read may be followed by one or more of the options listed here:
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .TS
 allbox tab(:);
-l l
-l l.
+l l s
+l l s
+^ l l
+^ l l.
 T{
 \fBCommand Line Format\fR
 T}:T{
 \-noprint
 T}
 T{
-\fBPermitted Values \fR
+\ \&
 T}:T{
-[\fInested\ table\fR]*
+\fBPermitted Values \fR
 T}
-.TE
-.sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B *[nested\ table]
-.TS
-allbox tab(:);
-l l
-l l.
-T{
+:T{
 \fBType\fR
 T}:T{
 boolean
 T}
-T{
+:T{
 \fBDefault\fR
 T}:T{
 FALSE
 T}
 .TE
 .sp 1
+\fB\-noprint\fR: Do not print the contents of the log file\&.
+.RE
+.sp
+.RS 4
+.ie n \{\
+\h'-04'\(bu\h'+03'\c
+.\}
+.el \{\
+.sp -1
+.IP \(bu 2.3
+.\}
 .TS
 allbox tab(:);
-l l
-l l.
+l l s
+l l s
+^ l l
+^ l l.
 T{
 \fBCommand Line Format\fR
 T}:T{
 \-nocheck
 T}
 T{
-\fBPermitted Values \fR
+\ \&
 T}:T{
-[\fInested\ table\fR]*
+\fBPermitted Values \fR
 T}
-.TE
-.sp 1
-.sp
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.B *[nested\ table]
-.TS
-allbox tab(:);
-l l
-l l.
-T{
+:T{
 \fBType\fR
 T}:T{
 boolean
 T}
-T{
+:T{
 \fBDefault\fR
 T}:T{
 FALSE
 T}
 .TE
 .sp 1
-.PP
-The name of the file to be read may be followed by one or more of the options listed here:
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
-\fB\-noprint\fR: Do not print the contents of the log file\&.
-.RE
-.sp
-.RS 4
-.ie n \{\
-\h'-04'\(bu\h'+03'\c
-.\}
-.el \{\
-.sp -1
-.IP \(bu 2.3
-.\}
 \fB\-nocheck\fR: Do not check the log file for errors\&.
 .RE
 .sp
@@ -184,7 +166,7 @@ You should have received a copy of the GNU General Public License along with the
 .IP " 1." 4
 Cluster Data Node FileSystemDir Files
 .RS 4
-\%http://dev.mysql.com/doc/ndbapi/en/ndb-internals-ndbd-filesystem.html#ndb-internals-ndbd-filesystemdir-files
+\%http://dev.mysql.com/doc/ndbapi/en/ndb-internals-ndbd-filesystemdir-files.html
 .RE
 .SH "SEE ALSO"
 For more information, please refer to the MySQL Reference Manual,

man/ndbmtd.8

@@ -2,12 +2,12 @@
 .\"     Title: \fBndbmtd\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBNDBMTD\FR" "8" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBNDBMTD\FR" "8" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------
@@ -49,8 +49,8 @@ Command\-line options and configuration parameters used with
 \fBndbd\fR
 also apply to
 \fBndbmtd\fR\&. For more information about these options and parameters, see
-Section\ \&17.6.3.2, \(lqProgram Options for ndbd and ndbmtd\(rq, and
-Section\ \&17.3.4.6, \(lqDefining MySQL Cluster Data Nodes\(rq, respectively\&.
+\fBndbd\fR(8), and
+Section\ \&17.3.2.6, \(lqDefining MySQL Cluster Data Nodes\(rq, respectively\&.
 .PP
 \fBndbmtd\fR
 is also file system\-compatible with
@@ -69,25 +69,13 @@ simply by stopping the node and then starting
 \fBndbd\fR
 in place of the multi\-threaded binary\&. It is not necessary when switching between the two to start the data node binary using
 \fB\-\-initial\fR\&.
-.if n \{\
-.sp
-.\}
-.RS 4
-.it 1 an-trap
-.nr an-no-space-flag 1
-.nr an-break-flag 1
-.br
-.ps +1
-\fBImportant\fR
-.ps -1
-.br
 .PP
-We do not currently recommend using
+Prior to MySQL Cluster NDB 7\&.0\&.6, there were known issues when using
 \fBndbmtd\fR
-with MySQL Cluster Disk Data tables in production, due to known issues which we are working to fix in a future MySQL Cluster release\&. (\m[blue]\fBBug#41915\fR\m[]\&\s-2\u[1]\d\s+2,
+with MySQL Cluster Disk Data tables\&. If you wish to use multi\-threaded data nodes with disk\-based
+NDB
+tables, you should insure that you are running MySQL Cluster NDB 7\&.0\&.6 or later\&. (\m[blue]\fBBug#41915\fR\m[]\&\s-2\u[1]\d\s+2,
 \m[blue]\fBBug#44915\fR\m[]\&\s-2\u[2]\d\s+2)
-.sp .5v
-.RE
 .PP
 Using
 \fBndbmtd\fR
@@ -129,6 +117,8 @@ failures\&.
 .RE
 .PP
 These differences are discussed in more detail in the next few paragraphs\&.
+.\" execution threads (MySQL Cluster)
+.\" MySQL Cluster: execution threads
 .\" ndbmtd: MaxNoOfExecutionThreads
 .\" MaxNoOfExecutionThreads: ndbmtd
 .\" ndbmtd: trace files
@@ -148,7 +138,7 @@ file, it is exclusive to
 and does not apply to
 \fBndbd\fR\&.
 .PP
-This parameter takes an integer value from 2 to 8 inclusive\&. Generally, you should set this to the number of CPU cores on the data node host, as shown in the following table:
+This parameter takes an integer value from 2 to 8 inclusive\&. Generally, you should set this parameter equal to the number of CPU cores on the data node host, as shown in the following table:
 .TS
 allbox tab(:);
 lB lB.

man/perror.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBperror\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBPERROR\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBPERROR\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/replace.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBreplace\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBREPLACE\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBREPLACE\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/resolve_stack_dump.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBresolve_stack_dump\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBRESOLVE_STACK_DUM" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBRESOLVE_STACK_DUM" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

man/resolveip.1

@@ -2,12 +2,12 @@
 .\"     Title: \fBresolveip\fR
 .\"    Author: [FIXME: author] [see http://docbook.sf.net/el/author]
 .\" Generator: DocBook XSL Stylesheets v1.75.2 <http://docbook.sf.net/>
-.\"      Date: 08/12/2009
+.\"      Date: 11/04/2009
 .\"    Manual: MySQL Database System
 .\"    Source: MySQL 5.1
 .\"  Language: English
 .\"
-.TH "\FBRESOLVEIP\FR" "1" "08/12/2009" "MySQL 5\&.1" "MySQL Database System"
+.TH "\FBRESOLVEIP\FR" "1" "11/04/2009" "MySQL 5\&.1" "MySQL Database System"
 .\" -----------------------------------------------------------------
 .\" * set default formatting
 .\" -----------------------------------------------------------------

support-files/MacOSX/ReadMe.txt

 
-2.5. Installing MySQL on Mac OS X
+2.7. Installing MySQL on Mac OS X
+
+   MySQL for Mac OS X is available in a number of different forms:
+
+     * Native Package Installer format, which uses the native Mac OS
+       X installer to walk you through the installation of MySQL. For
+       more information, see Section 2.7.1, "Installing MySQL Using
+       the Installation Package." You can use the package installer
+       with Mac OS X 10.3 and later, and available for both PowerPC
+       and Intel architectures, and both 32-bit and 64-bit
+       architectures. There is no Universal Binary available using
+       the package installation method. The user you use to perform
+       the installation must have administrator privileges.
+
+     * Tar package format, which uses a file packaged using the Unix
+       tar and gzip commands. To use this method, you will need to
+       open a Terminal window. You do not need administrator
+       privileges using this method, as you can install the MySQL
+       server anywhere using this method. For more information on
+       using this method, you can use the generic instructions for
+       using a tarball, Section 2.2, "Installing MySQL from Generic
+       Binaries on Unix/Linux."You can use the package installer with
+       Mac OS X 10.3 and later, and available for both PowerPC and
+       Intel architectures, and both 32-bit and 64-bit architectures.
+       A Universal Binary, incorporating both Power PC and Intel
+       architectures and 32-bit and 64-bit binaries is available.
+       In addition to the core installation, the Package Installer
+       also includes Section 2.7.2, "Installing the MySQL Startup
+       Item" and Section 2.7.3, "Installing and Using the MySQL
+       Preference Pane," both of which simplify the management of
+       your installation.
+
+     * Mac OS X server includes a version of MySQL as standard. If
+       you want to use a more recent version than that supplied with
+       the Mac OS X server release, you can make use of the package
+       or tar formats. For more information on using the MySQL
+       bundled with Mac OS X, see Section 2.7.4, "Using MySQL on Mac
+       OS X Server."
+
+   For additional information on using MySQL on Mac OS X, see Section
+   2.7.5, "MySQL Installation on Mac OS X Notes."
+
+2.7.1. Installing MySQL Using the Installation Package
 
    You can install MySQL on Mac OS X 10.3.x ("Panther") or newer
    using a Mac OS X binary package in PKG format instead of the
@@ -11,8 +53,6 @@
    first need to mount by double-clicking its icon in the Finder. It
    should then mount the image and display its contents.
 
-   To obtain MySQL, see Section 2.1.3, "How to Get MySQL."
-
 Note
 
    Before proceeding with the installation, be sure to shut down all
@@ -20,37 +60,213 @@ Note
    Application (on Mac OS X Server) or via mysqladmin shutdown on the
    command line.
 
-   To actually install the MySQL PKG file, double-click on the
-   package icon. This launches the Mac OS X Package Installer, which
-   guides you through the installation of MySQL.
+   When installing from the package version, you should also install
+   the MySQL Preference Pane, which will allow you to control the
+   startup and execution of your MySQL server from System
+   Preferences. For more information, see Section 2.7.3, "Installing
+   and Using the MySQL Preference Pane."
 
-   Due to a bug in the Mac OS X package installer, you may see this
-   error message in the destination disk selection dialog:
-You cannot install this software on this disk. (null)
+   When installing using the package installer, the files are
+   installed into a directory within /usr/local matching the name of
+   the installation version and platform. For example, the installer
+   file mysql-5.1.39-osx10.5-x86_64.pkg installs MySQL into
+   /usr/local/mysql-5.1.39-osx10.5-x86_64 . The installation layout
+   of the directory is as shown in the following table:
+   Directory       Contents of Directory
+   bin             Client programs and the mysqld server
+   data            Log files, databases
+   docs            Manual in Info format
+   include         Include (header) files
+   lib             Libraries
+   man             Unix manual pages
+   mysql-test      MySQL test suite
+   scripts         Contains the mysql_install_db script
+   share/mysql     Error message files
+   sql-bench       Benchmarks
+   support-files   Scripts and sample configuration files
+   /tmp/mysql.sock The location of the MySQL Unix socket
 
-   If this error occurs, simply click the Go Back button once to
-   return to the previous screen. Then click Continue to advance to
-   the destination disk selection again, and you should be able to
-   choose the destination disk correctly. We have reported this bug
-   to Apple and it is investigating this problem.
-
-   The Mac OS X PKG of MySQL installs itself into
-   /usr/local/mysql-VERSION and also installs a symbolic link,
-   /usr/local/mysql, that points to the new location. If a directory
-   named /usr/local/mysql exists, it is renamed to
-   /usr/local/mysql.bak first. Additionally, the installer creates
-   the grant tables in the mysql database by executing
-   mysql_install_db.
-
-   The installation layout is similar to that of a tar file binary
-   distribution; all MySQL binaries are located in the directory
-   /usr/local/mysql/bin. The MySQL socket file is created as
-   /tmp/mysql.sock by default. See Section 2.1.5, "Installation
-   Layouts."
-
-   MySQL installation requires a Mac OS X user account named mysql. A
-   user account with this name should exist by default on Mac OS X
-   10.2 and up.
+   During the package installer process, a symbolic link from
+   /usr/local/mysql to the version/platform specific directory
+   created during installation will be created automatically.
+
+    1. Download and open the MySQL package installer, which is
+       provided on a disk image (.dmg). Double-click to open the disk
+       image, which includes the main MySQL installation package, the
+       MySQLStartupItem.pkg installation package, and the
+       MySQL.prefPane.
+
+    2. Double-click on the MySQL installer package. It will be named
+       according to the version of MySQL you have downloaded. For
+       example, if you have downloaded MySQL 5.1.39, double-click
+       mysql-5.1.39-osx10.5-x86.pkg.
+
+    3. You will be presented with the openin installer dialog. Click
+       Continue to begihn installation.
+       MySQL Package Installer: Step 1
+
+    4. A copy of the installation instructions and other important
+       information relevant to this installation are display. Click
+       Continue .
+
+    5. If you have downloaded the community version of MySQL, you
+       will be shown a copy of the relevent GNU General Public
+       License. Click Continue .
+
+    6. Select the drive you want to use to install the MySQL Startup
+       Item. The drive must have a valid, bootable, Mac OS X
+       operating system installed. Click Continue.
+       MySQL Package Installer: Step 4
+
+    7. You will be asked to confirm the details of the installation,
+       including the space required for the installation. To change
+       the drive on which the startup item is installed you can click
+       either Go Back or Change Install Location.... To install the
+       startup item, click Install.
+
+    8. Once the installation has been completed successfully, you
+       will be given an Install Succeeded message.
+
+   Once you have completed the basic installation, you must complete
+   the post-installation steps as specifed in Section 2.13,
+   "Post-Installation Setup and Testing."
+
+   For convenience, you may also want to install the Section 2.7.2,
+   "Installing the MySQL Startup Item" and Section 2.7.3, "Installing
+   and Using the MySQL Preference Pane."
+
+2.7.2. Installing the MySQL Startup Item
+
+   The MySQL Installation Package includes a startup item that can be
+   used to automatically startup and shutdown MySQL during boot.
+
+   To install the MySQL Startup Item:
+
+    1. Download and open the MySQL package installer, which is
+       provided on a disk image (.dmg). Double-click to open the disk
+       image, which includes the main MySQL installation package, the
+       MySQLStartupItem.pkg installation package, and the
+       MySQL.prefPane.
+
+    2. Double-click on the MySQLStartItem.pkg file to start the
+       installation process.
+
+    3. You will be presented with the Install MySQL Startup Item
+       dialog.
+       MySQL Startup Item Installer: Step 1
+       Click Continue to continue the installation process.
+
+    4. A copy of the installation instructions and other important
+       information relevant to this installation are display. Click
+       Continue .
+
+    5. Select the drive you want to use to install the MySQL Startup
+       Item. The drive must have a valid, bootable, Mac OS X
+       operating system installed. Click Continue.
+       MySQL Startup Item Installer: Step 3
+
+    6. You will be asked to confirm the details of the installation.
+       To change the drive on which the startup item is installed you
+       can click either Go Back or Change Install Location.... To
+       install the startup item, click Install.
+
+    7. Once the installation has been completed successfully, you
+       will be given an Install Succeeded message.
+       MySQL Startup Item Installer: Step 5
+
+   The Startup Item for MySQL is installed into
+   /Library/StartupItems/MySQLCOM. The Startup Item installation adds
+   a variable MYSQLCOM=-YES- to the system configuration file
+   /etc/hostconfig. If you want to disable the automatic startup of
+   MySQL, simply change this variable to MYSQLCOM=-NO-.
+
+   After the installation, you can start up MySQL by running the
+   following commands in a terminal window. You must have
+   administrator privileges to perform this task.
+
+   If you have installed the Startup Item, use this command to start
+   the server:
+shell> sudo /Library/StartupItems/MySQLCOM/MySQLCOM start
+
+   You may be prompted for your password to complete the startup.
+
+   If you have installed the Startup Item, use this command to stop
+   the server:
+shell> sudo /Library/StartupItems/MySQLCOM/MySQLCOM stop
+
+   You may be prompted for your password to complete the shutdown.
+
+2.7.3. Installing and Using the MySQL Preference Pane
+
+   The MySQL Package installer disk image also includes a custom
+   MySQL Preference Pane that enables you to start, stop and control
+   automated startup during boot of your MySQL installation.
+
+   To install the MySQL Preference Pane:
+
+    1. Download and open the MySQL package installer package, which
+       is provided on a disk image (.dmg). Double-click to open the
+       disk image, which includes the main MySQL installation
+       package, the MySQLStartupItem.pkg installation package, and
+       the MySQL.prefPane.
+
+    2. Double click on MySQL.prefPane. The MySQL System Preferences
+       will open.
+
+    3. If this is the first time you have installed the preference
+       pane, you will be asked to confirm installation and whether
+       you want to install the preference pane for all users, or only
+       the current user. To install the preference pane for all users
+       you will need administrator privileges. If necessary, you will
+       be prompted for the username and password for a user with
+       administrator privileges.
+
+    4. If you already have the MySQL Preference Pane installed, you
+       will be asked to confirm whether you want to overwrite the
+       existing MySQL Preference Pane.
+
+Note
+
+   The MySQL Preference Pane only starts and stops MySQL installation
+   installed from the MySQL package installation that have been
+   installed in the default location.
+
+   Once the MySQL Preference Pane has been installed, you can control
+   your MySQL server instance using the preference pane. To use the
+   preference pane, open the System Preferences... from the Apple
+   menu. Select the MySQL preference pane by clicking on the MySQL
+   logo within the Other section of the preference panes list.
+   MySQL Preference Pane
+
+   The MySQL Preference Pane shows the current status of the MySQL
+   server, showing stopped (in red) if the server is not running and
+   running (in green) if the server has already been started. The
+   preference pane will also show the current setting for whether the
+   MySQL server has been set to start up automatically.
+
+     * To start MySQL using the preference pane: 
+       Click Start MySQL Server. You may be prompted for the username
+       and password of a user with administrator privileges to start
+       the MySQL server.
+
+     * To stop MySQL using the preference pane: 
+       Click Stop MySQL Server. You may be prompted for the username
+       and password of a user with administrator privileges to
+       shutdown the MySQL server.
+
+     * To automatically start the MySQL server when the system boots:
+       Check the checkbox next to Automatically Start MySQL Server on
+       Startup.
+
+     * To disable the automatic starting of the MySQL server when the
+       system boots:
+       Uncheck the checkbox next to Automatically Start MySQL Server
+       on Startup.
+
+   You can close the System Preferences... once you have completed
+   your settings.
+
+2.7.4. Using MySQL on Mac OS X Server
 
    If you are running Mac OS X Server, a version of MySQL should
    already be installed. The following table shows the versions of
@@ -61,103 +277,102 @@ You cannot install this software on this disk. (null)
    10.3                    4.0.14
    10.3.2                  4.0.16
    10.4.0                  4.1.10a
+   10.5.0                  5.0.45
+   10.6.0                  5.0.82
 
-   This manual section covers the installation of the official MySQL
-   Mac OS X PKG only. Make sure to read Apple's help information
-   about installing MySQL: Run the "Help View" application, select
-   "Mac OS X Server" help, do a search for "MySQL," and read the item
-   entitled "Installing MySQL."
-
-   If you previously used Marc Liyanage's MySQL packages for Mac OS X
-   from http://www.entropy.ch, you can simply follow the update
-   instructions for packages using the binary installation layout as
-   given on his pages.
-
-   If you are upgrading from Marc's 3.23.x versions or from the Mac
-   OS X Server version of MySQL to the official MySQL PKG, you also
-   need to convert the existing MySQL privilege tables to the current
-   format, because some new security privileges have been added. See
-   Section 4.4.8, "mysql_upgrade --- Check Tables for MySQL Upgrade."
-
-   If you want MySQL to start automatically during system startup,
-   you also need to install the MySQL Startup Item. It is part of the
-   Mac OS X installation disk images as a separate installation
-   package. Simply double-click the MySQLStartupItem.pkg icon and
-   follow the instructions to install it. The Startup Item need be
-   installed only once. There is no need to install it each time you
-   upgrade the MySQL package later.
+   The installation layout of MySQL on Mac OS X Server is as shown in
+   the table below:
+   Directory                   Contents of Directory
+   /usr/bin                    Client programs
+   /var/mysql                  Log files, databases
+   /usr/libexec                The mysqld server
+   /usr/share/man              Unix manual pages
+   /usr/share/mysql/mysql-test MySQL test suite
+   /usr/share/mysql            Contains the mysql_install_db script
+   /var/mysql/mysql.sock       The location of the MySQL Unix socket
 
-   The Startup Item for MySQL is installed into
-   /Library/StartupItems/MySQLCOM. (Before MySQL 4.1.2, the location
-   was /Library/StartupItems/MySQL, but that collided with the MySQL
-   Startup Item installed by Mac OS X Server.) Startup Item
-   installation adds a variable MYSQLCOM=-YES- to the system
-   configuration file /etc/hostconfig. If you want to disable the
-   automatic startup of MySQL, simply change this variable to
-   MYSQLCOM=-NO-.
-
-   On Mac OS X Server, the default MySQL installation uses the
-   variable MYSQL in the /etc/hostconfig file. The MySQL Startup Item
-   installer disables this variable by setting it to MYSQL=-NO-. This
-   avoids boot time conflicts with the MYSQLCOM variable used by the
-   MySQL Startup Item. However, it does not shut down a running MySQL
-   server. You should do that yourself.
+Note
 
-   After the installation, you can start up MySQL by running the
-   following commands in a terminal window. You must have
-   administrator privileges to perform this task.
+   The MySQL server bundled with Mac OS X Server does not include the
+   MySQL client libraries and header files required if you want to
+   access and use MySQL from a third-party driver, such as Perl DBI
+   or PHP. For more information on obtaining and installing MySQL
+   libraries, see Mac OS X Server version 10.5: MySQL libraries
+   available for download (http://support.apple.com/kb/TA25017).
+   Alternatively, you can ignore the bundled MySQL server and install
+   MySQL from the package or tarball installation.
 
-   If you have installed the Startup Item, use this command:
-shell> sudo /Library/StartupItems/MySQLCOM/MySQLCOM start
-(Enter your password, if necessary)
-(Press Control-D or enter "exit" to exit the shell)
+   For more information on managing the bundled MySQL instance in Mac
+   OS X Server 10.5, see Mac OS X Server: Web Technologies
+   Administration For Version 10.5 Leopard
+   (http://images.apple.com/server/macosx/docs/Web_Technologies_Admin
+   _v10.5.pdf). For more information on managing the bundled MySQL
+   instance in Mac OS X Server 10.6, see Mac OS X Server: Web
+   Technologies Administration Version 10.6 Snow Leopard
+   (http://manuals.info.apple.com/en_US/WebTech_v10.6.pdf).
 
-   If you don't use the Startup Item, enter the following command
-   sequence:
-shell> cd /usr/local/mysql
-shell> sudo ./bin/mysqld_safe
-(Enter your password, if necessary)
-(Press Control-Z)
-shell> bg
-(Press Control-D or enter "exit" to exit the shell)
+2.7.5. MySQL Installation on Mac OS X Notes
 
-   You should be able to connect to the MySQL server, for example, by
-   running /usr/local/mysql/bin/mysql.
+   You should keep the following issues and notes in mind:
 
-Note
+     * The default location for the MySQL Unix socket is different on
+       Mac OS X and Mac OS X Server depending on the installation
+       type you chose. The default locations by installation are as
+       follows:
 
-   The accounts that are listed in the MySQL grant tables initially
-   have no passwords. After starting the server, you should set up
-   passwords for them using the instructions in Section 2.11,
-   "Post-Installation Setup and Testing."
+       Package Installer from MySQL       /tmp/mysql.sock
+       Tarball from MySQL                 /tmp/mysql.sock
+       MySQL Bundled with Mac OS X Server /var/mysql/mysql.sock
+       To prevent issues, you should either change the configuration
+       of the socket used within your application (for example,
+       changing php.ini), or you should configure the socket location
+       using a MySQL configuration file and the socket option. For
+       more information, see Section 5.1.2, "Server Command Options."
+
+     * You may need (or want) to create a specific mysql user to own
+       the MySQL directory and data. On Mac OS X 10.4 and lower you
+       can do this by using the Netinfo Manager application, located
+       within the Utilities folder within the Applications folder. On
+       Mac OS X 10.5 and later you can do this through the Directory
+       Utility. From Mac OS X 10.5 and later (including Mac OS X
+       Server 10.5) the mysql should already exist. For use in single
+       user mode, an entry for _mysql (note the underscore prefix)
+       should already exist within the system /etc/passwd file.
 
-   You might want to add aliases to your shell's resource file to
-   make it easier to access commonly used programs such as mysql and
-   mysqladmin from the command line. The syntax for bash is:
+     * Due to a bug in the Mac OS X package installer, you may see
+       this error message in the destination disk selection dialog:
+You cannot install this software on this disk. (null)
+       If this error occurs, simply click the Go Back button once to
+       return to the previous screen. Then click Continue to advance
+       to the destination disk selection again, and you should be
+       able to choose the destination disk correctly. We have
+       reported this bug to Apple and it is investigating this
+       problem.
+
+     * Because the MySQL package installer installs the MySQL
+       contents into a version and platform specific directory, you
+       can use this to upgrade and migrate your database between
+       versions. You will need to either copy the data directory from
+       the old version to the new version, or alternatively specify
+       an alternative datadir value to set location of the data
+       directory.
+
+     * You might want to add aliases to your shell's resource file to
+       make it easier to access commonly used programs such as mysql
+       and mysqladmin from the command line. The syntax for bash is:
 alias mysql=/usr/local/mysql/bin/mysql
 alias mysqladmin=/usr/local/mysql/bin/mysqladmin
-
        For tcsh, use:
 alias mysql /usr/local/mysql/bin/mysql
 alias mysqladmin /usr/local/mysql/bin/mysqladmin
-
        Even better, add /usr/local/mysql/bin to your PATH environment
        variable. You can do this by modifying the appropriate startup
        file for your shell. For more information, see Section 4.2.1,
        "Invoking MySQL Programs."
 
-   If you are upgrading an existing installation, note that
-   installing a new MySQL PKG does not remove the directory of an
-   older installation. Unfortunately, the Mac OS X Installer does not
-   yet offer the functionality required to properly upgrade
-   previously installed packages.
-
-   To use your existing databases with the new installation, you'll
-   need to copy the contents of the old data directory to the new
-   data directory. Make sure that neither the old server nor the new
-   one is running when you do this. After you have copied over the
-   MySQL database files from the previous installation and have
-   successfully started the new server, you should consider removing
-   the old installation files to save disk space. Additionally, you
-   should also remove older versions of the Package Receipt
-   directories located in /Library/Receipts/mysql-VERSION.pkg.
+     * After you have copied over the MySQL database files from the
+       previous installation and have successfully started the new
+       server, you should consider removing the old installation
+       files to save disk space. Additionally, you should also remove
+       older versions of the Package Receipt directories located in
+       /Library/Receipts/mysql-VERSION.pkg.