List:Internals« Previous MessageNext Message »
From:jon Date:July 19 2005 11:51am
Subject:bk commit - mysqldoc@docsrva tree (jon:1.3064)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of jon. When jon does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet
  1.3064 05/07/19 19:51:17 jon@stripped +1 -0
  Merge bk://mysqldoc@stripped
  into  gigan.homedns.org:/home/jon/bk/mysqldoc

  refman-5.0/client-side-scripts.xml
    1.5 05/07/19 19:51:15 jon@stripped +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	jon
# Host:	gigan.
# Root:	/home/jon/bk/mysqldoc/RESYNC

--- 1.4/refman-5.0/client-side-scripts.xml	2005-07-19 07:14:54 +10:00
+++ 1.5/refman-5.0/client-side-scripts.xml	2005-07-19 19:51:15 +10:00
@@ -121,24 +121,64 @@
     A utility for reading statements from a binary log. The log of
     executed statements contained in the binary log files can be used to
     help recover from a crash. See <xref linkend="mysqlbinlog"/>.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><command>mysqlcc</command></primary>
-    </indexterm>
-   </para></listitem>
+  </para></listitem>
 
-   <listitem><para>
-    <literal>mysqlcc</literal>
-   </para>
+<!--  TODO: Find best placement of GUI tools info in this section.  -->
 
-   <para>
-    A client that provides a graphical interface for interacting with
-    the server. See <xref linkend="mysqlcc"/>.
-   </para>
+   <listitem>
+ 
+    <para>
+      MySQL AB also provide three GUI client programs for use with the 
+      MySQL server:
+      
+      <itemizedlist>
+        
+        <listitem><para>
+            <ulink url="http://dev.mysql.com/doc/administrator/en/">MySQL
Administrator</ulink>:
+            This tool is used for administering MySQL servers, databases, 
+            tables, and users.
+          </para></listitem>
+        
+        <listitem><para>
+            <ulink url="http://dev.mysql.com/doc/query-browser/en/">MySQL Query
Browser</ulink>:
+            This graphical tool is provided by MySQL AB for creating, 
+            executing, and optimizing queries on MySQL databases.
+          </para></listitem>
+        
+        <listitem><para>
+            <ulink url="http://dev.mysql.com/doc/migration-toolkit/en/">MySQL
Migration Toolkit</ulink>:
+            This tool is intended to help you with migrating schemas and 
+            data from other relational database management systems to 
+            MySQL.
+          </para></listitem>
+        
+      </itemizedlist>   
+    </para>
+    
+    <para>
+      <indexterm type="concept">
+        <primary>GUI tools</primary>
+        <secondary>MySQL Administrator</secondary>
+      </indexterm>
+     </para>
+  
+    <para>
+      <indexterm type="concept">
+        <primary>graphical clients</primary>
+        <secondary>MySQL Query Browser</secondary>
+      </indexterm>
+    </para>
+  
+    <para>
+      <indexterm type="concept">
+        <primary>graphical tools</primary>
+        <secondary>MySQL Migration Toolkit</secondary>
+      </indexterm>
+    </para>
+ 
+  </listitem>
 
-   <para>
+   <listitem><para>
     <indexterm type="concept">
      <primary><command>mysqlcheck</command></primary>
     </indexterm>
@@ -402,8 +442,7 @@
    When the table is used later, the information needed to decompress
    columns is read into memory. This results in much better performance
    when accessing individual records, because you only have to
-   uncompress exactly one record, not a much larger disk block as when
-   using Stacker on MS-DOS.
+   uncompress exactly one record.
   </para>
 
   <para>
@@ -413,15 +452,6 @@
   </para>
 
   <para>
-   A similar utility, <command>pack_isam</command>, compresses
-   <literal>ISAM</literal> tables. Because
<literal>ISAM</literal>
-   tables are deprecated, this section discusses only
-   <command>myisampack</command>, but the general procedures for using
-   <command>myisampack</command> are also true for
-   <command>pack_isam</command> unless otherwise specified.
-  </para>
-
-  <para>
    Please note the following:
   </para>
 
@@ -557,7 +587,7 @@
    </para>
 
    <para>
-    Don't actually pack the table, just test packing it.
+    Do not actually pack the table, just test packing it.
    </para></listitem>
 
    <listitem><para>
@@ -610,6 +640,8 @@
    The following sequence of commands illustrates a typical table
    compression session:
   </para>
+  
+<!--  TODO: Should this next example be updated? /JS  2005-07-19  -->
 
 <programlisting>
 shell&gt; ls -l station.*
@@ -826,7 +858,7 @@
    </para>
 
    <para>
-    The number of integer columns that don't occupy the full byte range
+    The number of integer columns that do not occupy the full byte range
     of their type; these are changed to a smaller type. For example, a
     <literal>BIGINT</literal> column (eight bytes) can be stored as a
     <literal>TINYINT</literal> column (one byte) if all its values are
@@ -919,7 +951,7 @@
     </para>
 
     <para>
-     Don't store endspace.
+     Do not store endspace.
     </para></listitem>
 
     <listitem><para>
@@ -927,7 +959,7 @@
     </para>
 
     <para>
-     Don't store endspace and don't do endspace compression for all
+     Do not store endspace and do not do endspace compression for all
      values.
     </para></listitem>
 
@@ -936,7 +968,7 @@
     </para>
 
     <para>
-     Don't store endspace. Don't store empty values.
+     Do not store endspace. Do not store empty values.
     </para></listitem>
 
     <listitem><para>
@@ -961,7 +993,7 @@
     </para>
 
     <para>
-     Don't store zeros.
+     Do not store zeros.
     </para></listitem>
 
     <listitem><para>
@@ -1004,16 +1036,6 @@
 </programlisting>
 
   <para>
-   A similar procedure applies for <literal>ISAM</literal> tables. After
-   using <command>pack_isam</command>, use
<command>isamchk</command> to
-   re-create the indexes:
-  </para>
-
-<programlisting>
-shell&gt; isamchk -rq --sort-index --analyze
<replaceable>tbl_name</replaceable>.ISM
-</programlisting>
-
-  <para>
    After you have installed the packed table into the MySQL database
    directory, you should execute <command>mysqladmin
    flush-tables</command> to force <command>mysqld</command> to start
@@ -1272,7 +1294,8 @@
 
    <para>
     Execute the statement and quit. The default output format is like
-    that produced with <literal>--batch</literal>.
+    that produced with <literal>--batch</literal>. See 
+    <xref linkend="command-line-options"/> for some examples.
    </para>
 
    <para>
@@ -1565,7 +1588,7 @@
    </para>
 
    <para>
-    The connection protocol to use. New in MySQL 4.1.
+    The connection protocol to use.
    </para>
 
    <para>
@@ -1580,7 +1603,7 @@
    </para>
 
    <para>
-    Don't cache each query result, print each row as it is received.
+    Do not cache each query result, print each row as it is received.
     This may slow down the server if the output is suspended. With this
     option, <command>mysql</command> doesn't use the history file.
    </para>
@@ -1616,7 +1639,7 @@
     If the connection to the server is lost, automatically try to
     reconnect. A single reconnect attempt is made each time the
     connection is lost. To suppress reconnection behavior, use
-    <literal>--skip-reconnect</literal>. New in MySQL 4.1.0.
+    <literal>--skip-reconnect</literal>.
    </para>
 
    <para>
@@ -1631,11 +1654,12 @@
    </para>
 
    <para>
-    Allow only <literal>UPDATE</literal> and
<literal>DELETE</literal>
-    statements that specify rows to affect using key values. If you have
-    this option in an option file, you can override it by using
-    <literal>--safe-updates</literal> on the command line. See
-    <xref linkend="mysql-tips"/> for more information about this option.
+    Allow only those <literal>UPDATE</literal> and 
+    <literal>DELETE</literal> statements that specify rows to affect 
+    using key values. If you have set this option in an option file, you 
+    can override it by using <literal>--safe-updates</literal> on the 
+    command line. See <xref linkend="mysql-tips"/> for more information 
+    about this option.
    </para>
 
    <para>
@@ -1652,7 +1676,7 @@
    <para>
     Do not send passwords to the server in old (pre-4.1.1) format. This
     prevents connections except for servers that use the newer password
-    format. This option was added in MySQL 4.1.1.
+    format.
    </para>
 
    <para>
@@ -1685,7 +1709,7 @@
 
    <para>
     Ignore <literal>SIGINT</literal> signals (typically the result of
-    typing Control-C). This option was added in MySQL 4.1.6.
+    typing Control-C).
    </para>
 
    <para>
@@ -1716,7 +1740,7 @@
    </para>
 
    <para>
-    Don't write column names in results.
+    Do not write column names in results.
    </para>
 
    <para>
@@ -1731,7 +1755,7 @@
    </para>
 
    <para>
-    Don't write line numbers for errors. Useful when you want to compare
+    Do not write line numbers for errors. Useful when you want to compare
     result files that include error messages.
    </para>
 
@@ -1982,7 +2006,7 @@
   
<literal>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
    or <literal>-O
   
<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
-   syntax. However, this syntax is deprecated as of MySQL 4.0.
+   syntax. In MySQL 5.0, this syntax is deprecated.
   </para>
 
   <indexterm type="type">
@@ -2246,7 +2270,7 @@
     <command>tee</command> used with the <literal>pager</literal>
     command and the <command>mysql</command> built-in
     <literal>tee</literal> command is that the built-in
-    <literal>tee</literal> works even if you don't have the Unix
+    <literal>tee</literal> works even if you do not have the Unix
     <command>tee</command> available. The built-in
     <literal>tee</literal> also logs everything that is printed on the
     screen, whereas the Unix <command>tee</command> used with
@@ -2261,9 +2285,9 @@
    </indexterm>
 
    <para>
-    From MySQL 4.0.2 on, the default <literal>mysql&gt;</literal> prompt
-    can be reconfigured. The string for defining the prompt can contain
-    the following special sequences:
+    In MySQL 5.0, the default <literal>mysql&gt;</literal> prompt can be 
+    reconfigured. The string for defining the prompt can contain the 
+    following special sequences:
    </para>
 
 <!--  FIX these columnfractions have NOT been measured! -->
@@ -2727,10 +2751,9 @@
     <para>
      For beginners, a useful startup option is
      <literal>--safe-updates</literal> (or
-     <literal>--i-am-a-dummy</literal>, which has the same effect). This
-     option was introduced in MySQL 3.23.11. It is helpful for cases
-     when you might have issued a <literal>DELETE FROM
-     <replaceable>tbl_name</replaceable></literal> statement but
+     <literal>--i-am-a-dummy</literal>, which has the same effect). It 
+     is helpful for cases when you might have issued a <literal>DELETE 
+       FROM <replaceable>tbl_name</replaceable></literal> statement but
      forgotten the <literal>WHERE</literal> clause. Normally, such a
      statement deletes all rows from the table. With
      <literal>--safe-updates</literal>, you can delete rows only by
@@ -2743,7 +2766,7 @@
      <command>mysql</command> issues the following statement when it
      connects to the MySQL server:
     </para>
-
+  
 <programlisting>
 SET SQL_SAFE_UPDATES=1,SQL_SELECT_LIMIT=1000, SQL_MAX_JOIN_SIZE=1000000;
 </programlisting>
@@ -2837,7 +2860,7 @@
      The <literal>@a</literal> user variable has been lost with the
      connection, and after the reconnection it is undefined. If it is
      important to have <command>mysql</command> terminate with an error
-     if the connection has been lost, you can start the
+     when the connection has been lost, you can start the
      <command>mysql</command> client with the
      <literal>--skip-reconnect</literal> option.
     </para>
@@ -2966,7 +2989,7 @@
    </para>
 
    <para>
-    Flush the thread cache. (Added in MySQL 3.23.16.)
+    Flush the thread cache.
    </para></listitem>
 
    <listitem><para>
@@ -2984,8 +3007,8 @@
 
    <para>
     This is like the <literal>password</literal> command but stores the
-    password using the old (pre-4.1) password-hashing format. This
-    command was added in MySQL 4.1.0.
+    password using the old (pre-4.1) password-hashing format. (See 
+    <xref linkend="password-hashing"/>.)
    </para></listitem>
 
    <listitem><para>
@@ -3002,9 +3025,9 @@
     If <replaceable>new-password</replaceable> contains spaces or other
     characters that are special to your command interpreter, you need to
     enclose it within quotes. On Windows, be sure to use double quotes
-    rather than single quotes; single quotes are not be stripped from
-    the password, they are interpreted as part of the password. For
-    example:
+    rather than single quotes; single quotes are not stripped from
+    the password, but rather are interpreted as part of the password. 
+    For example:
    </para>
 
    <para>
@@ -3018,10 +3041,10 @@
    <para>
     Check whether the server is alive. The return status from
     <command>mysqladmin</command> is 0 if the server is running, 1 if it
-    is not. Beginning with MySQL 4.0.22, the status is 0 even in case of
-    an error such as <literal>Access denied</literal>, because that
-    means the server is running but disallowed the connection, which is
-    different from the server not running.
+    is not. In MySQL 5.0, the status is 0 even in case of an error such 
+    as <literal>Access denied</literal>, because this means that the 
+    server is running but disallowed the connection, which is not the 
+    same as the server not running.
    </para></listitem>
 
    <listitem><para>
@@ -3032,7 +3055,8 @@
     Show a list of active server threads. This is like the output of the
     <literal>SHOW PROCESSLIST</literal> statement. If the
     <literal>--verbose</literal> option is given, the output is like
-    that of <literal>SHOW FULL PROCESSLIST</literal>.
+    that of <literal>SHOW FULL PROCESSLIST</literal>. (See 
+    <xref linkend="show-processlist"/>.)
    </para></listitem>
 
    <listitem><para>
@@ -3064,7 +3088,7 @@
    </para>
 
    <para>
-    Start replication on a slave server. (Added in MySQL 3.23.16.)
+    Start replication on a slave server.
    </para></listitem>
 
    <listitem><para>
@@ -3080,7 +3104,7 @@
    </para>
 
    <para>
-    Stop replication on a slave server. (Added in MySQL 3.23.16.)
+    Stop replication on a slave server.
    </para></listitem>
 
    <listitem><para>
@@ -3107,14 +3131,15 @@
 
 <programlisting>
 shell&gt; mysqladmin proc stat
-+----+-------+-----------+----+-------------+------+-------+------+
-| Id | User  | Host      | db | Command     | Time | State | Info |
-+----+-------+-----------+----+-------------+------+-------+------+
-| 6  | monty | localhost |    | Processlist | 0    |       |      |
-+----+-------+-----------+----+-------------+------+-------+------+
-Uptime: 10077  Threads: 1  Questions: 9  Slow queries: 0
-Opens: 6 Flush tables: 1  Open tables: 2
-Memory in use: 1092K  Max memory used: 1116K
++----+------+-----------+----+---------+------+-------+------------------+
+| Id | User | Host      | db | Command | Time | State | Info             |
++----+------+-----------+----+---------+------+-------+------------------+
+| 51 | root | localhost |    | Query   | 0    |       | show processlist |
++----+------+-----------+----+---------+------+-------+------------------+
+Uptime: 1473624  Threads: 1  Questions: 39487  
+Slow queries: 0  Opens: 541  Flush tables: 1  
+Open tables: 19  Queries per second avg: 0.0268
+Memory in use: 92M  Max memory used: 410M
 </programlisting>
 
   <indexterm type="concept">
@@ -3357,7 +3382,7 @@
 
    <para>
     Use <replaceable>charset</replaceable> as the default character set.
-    See <xref linkend="character-sets"/>. Added in MySQL 4.1.9.
+    See <xref linkend="character-sets"/>.
    </para></listitem>
 
    <listitem><para>
@@ -3365,7 +3390,7 @@
    </para>
 
    <para>
-    Don't ask for confirmation for the <literal>drop database</literal>
+    Do not ask for confirmation for the <literal>drop database</literal>
     command. With multiple commands, continue even if an error occurs.
    </para></listitem>
 
@@ -3560,8 +3585,7 @@
   <para>
    The binary log files that the server generates are written in binary
    format. To examine these files in text format, use the
-   <command>mysqlbinlog</command> utility. It is available as of MySQL
-   3.23.14.
+   <command>mysqlbinlog</command> utility.
   </para>
 
   <para>
@@ -3706,8 +3730,7 @@
    </para>
 
    <para>
-    Deprecated, use <literal>--start-position</literal> instead
-    (starting from MySQL 4.1.4).
+    Deprecated, use <literal>--start-position</literal> instead.
    </para></listitem>
 
    <listitem><para>
@@ -3715,7 +3738,7 @@
    </para>
 
    <para>
-    The connection protocol to use. New in MySQL 4.1.
+    The connection protocol to use.
    </para></listitem>
 
    <listitem><para>
@@ -3779,8 +3802,7 @@
    </para>
 
    <para>
-    This option is available as of MySQL 4.1.4. It is useful for
-    point-in-time recovery.
+    This option is useful for point-in-time recovery.
    </para></listitem>
 
    <listitem><para>
@@ -3792,8 +3814,7 @@
     equal or posterior to the <literal>datetime</literal> argument. See
     the description of the <literal>--start-datetime</literal> option
     for information about the <literal>datetime value</literal>. This
-    option is available as of MySQL 4.1.4. It is useful for
-    point-in-time recovery.
+    option is useful for point-in-time recovery.
    </para></listitem>
 
    <listitem><para>
@@ -3802,8 +3823,7 @@
 
    <para>
     Start reading the binary log at the first event having a position
-    equal to the <literal>N</literal> argument. Available as of MySQL
-    4.1.4 (previously named <literal>--position</literal>).
+    equal to the <literal>N</literal> argument.
    </para></listitem>
 
    <listitem><para>
@@ -3812,8 +3832,7 @@
 
    <para>
     Stop reading the binary log at the first event having a position
-    equal or greater than the <literal>N</literal> argument. Available
-    as of MySQL 4.1.4.
+    equal or greater than the <literal>N</literal> argument.
    </para></listitem>
 
    <listitem><para>
@@ -3825,8 +3844,7 @@
     server, but rather continue printing until the end of the last
     binary log. If you send the output to the same MySQL server, this
     may lead to an endless loop. This option requires
-    <literal>--read-from-remote-server</literal>. Available as of MySQL
-    4.1.2.
+    <literal>--read-from-remote-server</literal>.
    </para></listitem>
 
    <listitem><para>
@@ -3840,7 +3858,7 @@
     useful when restoring after a crash to avoid duplication of the
     statements you have logged. <emphasis role="bold">Note</emphasis>:
     This option requires that you have the <literal>SUPER</literal>
-    privilege. Available as of MySQL 4.1.8.
+    privilege.
    </para></listitem>
 
    <listitem><para>
@@ -3906,7 +3924,7 @@
   <para>
    You can also redirect the output of <command>mysqlbinlog</command> to
    a text file instead, if you need to modify the statement log first
-   (for example, to remove statements that you don't want to execute for
+   (for example, to remove statements that you do not want to execute for
    some reason). After editing the file, execute the statements that it
    contains by using it as input to the <command>mysql</command>
    program.
@@ -3943,13 +3961,14 @@
    log contains a statement that uses the temporary table. When the
    first <command>mysql</command> process terminates, the server drops
    the temporary table. When the second <command>mysql</command> process
-   attempts to use the table, the server reports ``unknown table.''
+   attempts to use the table, the server reports 
+   <quote><literal>unknown table</literal></quote>.
   </para>
 
   <para>
-   To avoid problems like this, use a single connection to execute the
-   contents of all binary logs that you want to process. Here is one way
-   to do that:
+   To avoid problems like this, use a <emphasis>single</emphasis> 
+   connection to execute the contents of all binary logs that you want 
+   to process. Here is one way to do this:
   </para>
 
 <programlisting>
@@ -3967,17 +3986,13 @@
 </programlisting>
 
   <para>
-   In MySQL 3.23, the binary log did not contain the data to load for
-   <literal>LOAD DATA INFILE</literal> statements. To execute such a
-   statement from a binary log file, the original data file was needed.
-   Starting from MySQL 4.0.14, the binary log does contain the data, so
-   <command>mysqlbinlog</command> can produce output that reproduces the
-   <literal>LOAD DATA INFILE</literal> operation without the original
-   data file. <command>mysqlbinlog</command> copies the data to a
-   temporary file and writes a <literal>LOAD DATA LOCAL INFILE</literal>
-   statement that refers to the file. The default location of the
-   directory where these files are written is system-specific. To
-   specify a directory explicitly, use the
+   In MySQL 5.0, <command>mysqlbinlog</command> can produce output that 
+   reproduces a <literal>LOAD DATA INFILE</literal> operation without 
+   the original data file. <command>mysqlbinlog</command> copies the 
+   data to a temporary file and writes a <literal>LOAD DATA LOCAL 
+     INFILE</literal> statement that refers to the file. The default 
+   location of the directory where these files are written is 
+   system-specific. To specify a directory explicitly, use the
    <literal>--local-load</literal> option.
   </para>
 
@@ -4009,534 +4024,25 @@
    INFILE</literal> statements have been executed.
   </para>
 
-  <para>
-   Before MySQL 4.1, <command>mysqlbinlog</command> could not prepare
-   output suitable for <command>mysql</command> if the binary log
-   contained interlaced statements originating from different clients
-   that used temporary tables of the same name. This is fixed in MySQL
-   4.1. However, the problem still existed for <literal>LOAD DATA
-   INFILE</literal> statements until it was fixed in MySQL 4.1.8.
-  </para>
-
- </section>
-
- <section id="mysqlcc">
-
-  <title id='title-mysqlcc'>&title-mysqlcc;</title>
-
-  <indexterm type="concept">
-   <primary>graphical tool</primary>
-  </indexterm>
-
-  <indexterm type="concept">
-   <primary>GUI tool</primary>
-  </indexterm>
-
-  <indexterm type="concept">
-   <primary>tools</primary>
-   <secondary>graphical</secondary>
-  </indexterm>
-
-  <indexterm type="concept">
-   <primary>tools</primary>
-   <secondary>GUI</secondary>
-  </indexterm>
-
-  <indexterm type="concept">
-   <primary><command>mysqlcc</command></primary>
-  </indexterm>
-
-  <para>
-   <command>mysqlcc</command>, the MySQL Control Center, is a
-   platform-independent client that provides a graphical user interface
-   (GUI) to the MySQL database server. It supports interactive use,
-   including syntax highlighting and tab completion. It provides
-   database and table management, and allows server administration.
-  </para>
-
-  <para>
-   <command>mysqlcc</command> is deprecated and it is recommended that
-   users choose the new MySQL Administrator and MySQL Query Browser,
-   found at <ulink url="http://dev.mysql.com/downloads/"/>.
-  </para>
-
-<!--  @command{mysqlcc} is not included with MySQL distributions, but can be
downloaded -->
-
-<!--  separately at @uref{http://dev.mysql.com/downloads/}. -->
-
-  <para>
-   Currently, <command>mysqlcc</command> runs on Windows and Linux
-   platforms.
-  </para>
-
-  <para>
-   Invoke <command>mysqlcc</command> by double-clicking its icon in a
-   graphical environment. From the command line, invoke it like this:
-  </para>
-
-<programlisting>
-shell&gt; mysqlcc [<replaceable>options</replaceable>]
-</programlisting>
-
-  <indexterm type="concept">
-   <primary><command>mysqlcc</command> command-line
options</primary>
-  </indexterm>
-
-  <indexterm type="concept">
-   <primary>command-line options</primary>
-   <secondary><command>mysqlcc</command></secondary>
-  </indexterm>
-
-  <indexterm type="concept">
-   <primary>options</primary>
-   <secondary>command-line</secondary>
-   <tertiary><command>mysqlcc</command></tertiary>
-  </indexterm>
-
-  <indexterm type="concept">
-   <primary>startup parameters</primary>
-   <secondary><command>mysqlcc</command></secondary>
-  </indexterm>
-
-  <para>
-   <command>mysqlcc</command> supports the following options:
-  </para>
-
-  <itemizedlist>
-
-   <indexterm type="concept">
-    <primary><literal>help</literal></primary>
-    <secondary><command>mysqlcc</command> option</secondary>
-   </indexterm>
-
-   <listitem><para>
-    <literal>--help, -?</literal>
-   </para>
-
-   <para>
-    Display a help message and exit.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>blocking_queries</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--blocking_queries, -b</literal>
-   </para>
-
-   <para>
-    Use blocking queries.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>compress</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--compress, -C</literal>
-   </para>
-
-   <para>
-    Compress all information sent between the client and the server if
-    both support compression.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>connection_name</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--connection_name=<replaceable>name</replaceable>, -c
-    <replaceable>name</replaceable></literal>
-   </para>
-
-   <para>
-    This option is a synonym for <literal>--server</literal>.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>database</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--database=<replaceable>db_name</replaceable>, -d
-    <replaceable>db_name</replaceable></literal>
-   </para>
-
-   <para>
-    The database to use. This is useful mainly in an option file.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>history_size</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--history_size=<replaceable>#</replaceable>, -H
-    <replaceable>#</replaceable></literal>
-   </para>
-
-   <para>
-    The history size for the query window.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>host</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--host=<replaceable>host_name</replaceable>, -h
-    <replaceable>host_name</replaceable></literal>
-   </para>
-
-   <para>
-    Connect to the MySQL server on the given host.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>local-infile</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--local-infile[={0|1}]</literal>
-   </para>
-
-   <para>
-    Enable or disable <literal>LOCAL</literal> capability for
-    <literal>LOAD DATA INFILE</literal>. With no value, the option
-    enables <literal>LOCAL</literal>. It may be given as
-    <literal>--local-infile=0</literal> or
-    <literal>--local-infile=1</literal> to explicitly disable or enable
-    <literal>LOCAL</literal>. Enabling <literal>LOCAL</literal>
has no
-    effect if the server does not also support it.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>password</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--password[=<replaceable>password</replaceable>],
-    -p[<replaceable>password</replaceable>]</literal>
-   </para>
-
-   <para>
-    The password to use when connecting to the server. If you use the
-    short option form (<literal>-p</literal>), you
-    <emphasis>cannot</emphasis> have a space between the option and the
-    password. If you omit the <replaceable>password</replaceable> value
-    following the <literal>--password</literal> or
<literal>-p</literal>
-    option on the command line, you are prompted for one.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>plugins_path</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--plugins_path=<replaceable>name</replaceable>, -g
-    <replaceable>name</replaceable></literal>
-   </para>
-
-   <para>
-    The path to the directory where MySQL Control Center plugins are
-    located.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>port</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--port=<replaceable>port_num</replaceable>, -P
-    <replaceable>port_num</replaceable></literal>
-   </para>
-
-   <para>
-    The TCP/IP port number to use for the connection.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>query</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--query, -q</literal>
-   </para>
-
-   <para>
-    Open a query window on startup.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>register</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--register, -r</literal>
-   </para>
-
-   <para>
-    Open the Register Server dialog on startup.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>server</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--server=<replaceable>name</replaceable>, -s
-    <replaceable>name</replaceable></literal>
-   </para>
-
-   <para>
-    The MySQL Control Center connection name.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>socket</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--socket=<replaceable>path</replaceable>, -S
-    <replaceable>path</replaceable></literal>
-   </para>
-
-   <para>
-    The socket file to use for the connection.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>syntax</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--syntax, -y</literal>
-   </para>
-
-   <para>
-    Enable syntax highlighting and completion.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>syntax_file</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--syntax_file=<replaceable>name</replaceable>, -Y
-    <replaceable>name</replaceable></literal>
-   </para>
-
-   <para>
-    The syntax file for completion.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>translations_path</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--translations_path=<replaceable>name</replaceable>, -T
-    <replaceable>name</replaceable></literal>
-   </para>
-
-   <para>
-    The path to the directory where MySQL Control Center translations
-    are located.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>user</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--user=<replaceable>user_name</replaceable>, -u
-    <replaceable>user_name</replaceable></literal>
-   </para>
-
-   <para>
-    The MySQL username to use when connecting to the server.
-   </para>
-
-   <para>
-    <indexterm type="concept">
-     <primary><literal>version</literal></primary>
-     <secondary><command>mysqlcc</command> option</secondary>
-    </indexterm>
-   </para></listitem>
-
-   <listitem><para>
-    <literal>--version, -V</literal>
-   </para>
-
-   <para>
-    Display version information and exit.
-   </para></listitem>
-
-  </itemizedlist>
-
-  <para>
-   You can also set the following variables by using
-  
<literal>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
-   options:
-  </para>
-
-  <indexterm type="concept">
-   <primary>timeout</primary>
-   <secondary><literal>connect_timeout</literal>
variable</secondary>
-  </indexterm>
-
-  <indexterm type="concept">
-   <primary><literal>connect_timeout</literal> variable</primary>
-  </indexterm>
-
-  <indexterm type="concept">
-   <primary><literal>max_allowed_packet</literal>
variable</primary>
-  </indexterm>
-
-  <indexterm type="concept">
-   <primary><literal>max_join_size</literal> variable</primary>
-  </indexterm>
-
-  <indexterm type="concept">
-   <primary><literal>net_buffer_length</literal>
variable</primary>
-  </indexterm>
-
-  <indexterm type="concept">
-   <primary><literal>select_limit</literal> variable</primary>
-  </indexterm>
-
-  <itemizedlist>
-
-   <listitem><para>
-    <literal>connect_timeout</literal>
-   </para>
-
-   <para>
-    The number of seconds before connection timeout. (Default value is
-    0.)
-   </para></listitem>
-
-   <listitem><para>
-    <literal>max_allowed_packet</literal>
-   </para>
-
-   <para>
-    The maximum packet length to send to or receive from the server.
-    (Default value is 16MB.)
-   </para></listitem>
-
-   <listitem><para>
-    <literal>max_join_size</literal>
-   </para>
-
-   <para>
-    The automatic limit for rows in a join. (Default value is
-    1,000,000.)
-   </para></listitem>
-
-   <listitem><para>
-    <literal>net_buffer_length</literal>
-   </para>
-
-   <para>
-    The buffer size for TCP/IP and socket communication. (Default value
-    is 16KB.)
-   </para></listitem>
-
-   <listitem><para>
-    <literal>select_limit</literal>
-   </para>
-
-   <para>
-    The automatic limit for <literal>SELECT</literal> statements.
-    (Default value is 1,000.)
-   </para></listitem>
-
-  </itemizedlist>
-
-  <para>
-   It is also possible to set variables by using
-  
<literal>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
-   or <literal>-O
-  
<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
-   syntax. However, this syntax is deprecated as of MySQL 4.0.
-  </para>
-
  </section>
 
  <section id="using-mysqlcheck">
 
   <title id='title-using-mysqlcheck'>&title-using-mysqlcheck;</title>
 
-<!--  TODO: This is no longer fully accurate. mysqlcheck can be used for some -->
-
-<!--  operations on table types other than MyISAM. -->
-
-<!--  TODO: There probably should be more reference to this program from within -->
-
-<!--  the table maintenance section. -->
+<!--  
+      TODO: This is no longer fully accurate. mysqlcheck can be used for 
+      some operations on table types other than MyISAM. 
+-->
+<!--  
+      TODO: There probably should be more references to this program 
+      from within the table maintenance section. 
+-->
 
   <para>
    The <command>mysqlcheck</command> client checks and repairs
    <literal>MyISAM</literal> tables. It can also optimize and analyze
-   tables. <command>mysqlcheck</command> is available as of MySQL
-   3.23.38.
+   tables.
   </para>
 
   <para>
@@ -4569,7 +4075,7 @@
 </programlisting>
 
   <para>
-   If you don't name any tables or use the
+   If you do not name any tables or use the
    <literal>--databases</literal> or
<literal>--all-databases</literal>
    option, entire databases are checked.
   </para>
@@ -4825,7 +4331,7 @@
    </para>
 
    <para>
-    The connection protocol to use. New in MySQL 4.1.
+    The connection protocol to use.
    </para></listitem>
 
    <listitem><para>
@@ -4913,9 +4419,10 @@
 
   <title id='title-mysqldump'>&title-mysqldump;</title>
 
-<!--  TODO: indicate what privileges are required for the various dump operations
-->
-
-<!--  SELECT, LOCK, RELOAD -->
+<!--  
+      TODO: indicate what privileges are required for the various dump 
+      operations: SELECT, LOCK, RELOAD 
+-->
 
   <indexterm type="concept">
    <primary>dumping</primary>
@@ -4952,8 +4459,9 @@
   <para>
    If you are doing a backup on the server, and your tables all are
    <literal>MyISAM</literal> tables, you could consider using the
-   <command>mysqlhotcopy</command> instead (faster backup, faster
-   restore). See <xref linkend="mysqlhotcopy"/>.
+   <command>mysqlhotcopy</command> instead since faster backups and 
+   faster restores can be accomplished with the latter. See 
+   <xref linkend="mysqlhotcopy"/>.
   </para>
 
   <para>
@@ -4967,7 +4475,7 @@
 </programlisting>
 
   <para>
-   If you don't name any tables or use the
+   If you do not name any tables or use the
    <literal>--databases</literal> or
<literal>--all-databases</literal>
    option, entire databases are dumped.
   </para>
@@ -4983,8 +4491,8 @@
    <literal>--quick</literal> or <literal>--opt</literal> option,
    <command>mysqldump</command> loads the whole result set into memory
    before dumping the result. This probably is a problem if you are
-   dumping a big database. As of MySQL 4.1, <literal>--opt</literal> is
-   on by default, but can be disabled with
+   dumping a big database. In MySQL 4.0, <literal>--opt</literal> is
+   enabled by default, but can be disabled with
    <literal>--skip-opt</literal>.
   </para>
 
@@ -4996,50 +4504,6 @@
   </para>
 
   <para>
-   Before MySQL 4.1.2, out-of-range numeric values such as
-   <literal>-inf</literal> and <literal>inf</literal>, as well as
NaN
-   (not-a-number) values are dumped by <command>mysqldump</command> as
-   <literal>NULL</literal>. You can see this using the following sample
-   table:
-  </para>
-
-<programlisting>
-mysql&gt; CREATE TABLE t (f DOUBLE);
-mysql&gt; INSERT INTO t VALUES(1e+111111111111111111111);
-mysql&gt; INSERT INTO t VALUES(-1e111111111111111111111);
-mysql&gt; SELECT f FROM t;
-+------+
-| f    |
-+------+
-|  inf |
-| -inf |
-+------+
-</programlisting>
-
-  <para>
-   For this table, <command>mysqldump</command> produces the following
-   data output:
-  </para>
-
-<programlisting>
---
--- Dumping data for table `t`
---
-
-INSERT INTO t VALUES (NULL);
-INSERT INTO t VALUES (NULL);
-</programlisting>
-
-  <para>
-   The significance of this behavior is that if you dump and restore the
-   table, the new table has contents that differ from the original
-   contents. This problem is fixed as of MySQL 4.1.2; you cannot insert
-   <literal>inf</literal> in the table, so this
-   <command>mysqldump</command> behavior is only relevant when you deal
-   with old servers.
-  </para>
-
-  <para>
    <command>mysqldump</command> supports the following options:
   </para>
 
@@ -5069,7 +4533,7 @@
    <para>
     Surround each table dump with <literal>LOCK TABLES</literal> and
     <literal>UNLOCK TABLES</literal> statements. This results in faster
-    inserts when the dump file is reloaded. See
+    inserts when the dump file is reloaded. See 
     <xref linkend="insert-speed"/>.
    </para></listitem>
 
@@ -5101,8 +4565,7 @@
     the dump file such as program version, server version, and host.
     <literal>--skip-comments</literal> has the same effect as
     <literal>--comments=0</literal>. The default value is
-    <literal>1</literal> to not suppress the extra information. New in
-    MySQL 4.0.17.
+    <literal>1</literal>, which includes the extra information.
    </para></listitem>
 
    <listitem><para>
@@ -5114,7 +4577,7 @@
     enables the <literal>--skip-add-drop-table</literal>,
     <literal>--no-set-names</literal>,
     <literal>--skip-disable-keys</literal>, and
-    <literal>--skip-add-locks</literal> options. New in MySQL 4.1.2.
+    <literal>--skip-add-locks</literal> options.
    </para></listitem>
 
    <listitem><para>
@@ -5134,11 +4597,6 @@
     them by commas. These values have the same meaning as the
     corresponding options for setting the server SQL mode. See
     <xref linkend="server-sql-mode"/>.
-   </para>
-
-   <para>
-    This option requires a server version of 4.1.0 or higher. With older
-    servers, it does nothing.
    </para></listitem>
 
    <listitem><para>
@@ -5165,8 +4623,7 @@
 
    <para>
     Include all MySQL-specific table options in the <literal>CREATE
-    TABLE</literal> statements. Before MySQL 4.1.2, use
-    <literal>--all</literal> instead.
+    TABLE</literal> statements.
    </para></listitem>
 
    <listitem><para>
@@ -5190,7 +4647,7 @@
 
    <para>
     Write a debugging log. The <replaceable>debug_options</replaceable>
-    string often is
+    string is often
    
<literal>'d:t:o,<replaceable>file_name</replaceable>'</literal>.
    </para></listitem>
 
@@ -5201,9 +4658,8 @@
    <para>
     Use <replaceable>charset</replaceable> as the default character set.
     See <xref linkend="character-sets"/>. If not specified,
-    <command>mysqldump</command> from MySQL 4.1.2 or later uses
-    <literal>utf8</literal>, and earlier versions use
-    <literal>latin1</literal>.
+    <command>mysqldump</command> from MySQL 5.0 uses 
+    <literal>utf8</literal>.
    </para></listitem>
 
    <listitem><para>
@@ -5221,10 +4677,8 @@
 
    <para>
     On a master replication server, delete the binary logs after
-    performing the dump operation. This option automatically enables
-    <literal>--first-slave</literal> before MySQL 4.1.8 and enables
-    <literal>--master-data</literal> thereafter. It was added in MySQL
-    3.23.57 (for MySQL 3.23) and MySQL 4.0.13 (for MySQL 4.0).
+    performing the dump operation. In MySQL 5.0, this option 
+    automatically enables <literal>--master-data</literal>.
    </para></listitem>
 
    <listitem><para>
@@ -5237,9 +4691,9 @@
     <replaceable>tbl_name</replaceable> DISABLE KEYS */;</literal> and
     <literal>/*!40000 ALTER TABLE <replaceable>tbl_name</replaceable>
     ENABLE KEYS */;</literal> statements. This makes loading the dump
-    file into a MySQL 4.0 server faster because the indexes are created
-    after all rows are inserted. This option is effective only for
-    <literal>MyISAM</literal> tables.
+    file into a MySQL 4.0 or later server faster because the indexes are 
+    created only after all rows are inserted. This option is effective 
+    only for <literal>MyISAM</literal> tables.
    </para></listitem>
 
    <listitem><para>
@@ -5271,8 +4725,7 @@
    </para>
 
    <para>
-    Deprecated, renamed to <literal>--lock-all-tables</literal> in MySQL
-    4.1.8.
+    Deprecated, now renamed to <literal>--lock-all-tables</literal>.
    </para></listitem>
 
    <listitem><para>
@@ -5320,11 +4773,8 @@
    <para>
     Dump binary string columns using hexadecimal notation (for example,
     <literal>'abc'</literal> becomes
<literal>0x616263</literal>). The
-    affected columns are <literal>BINARY</literal>,
-    <literal>VARBINARY</literal>, and <literal>BLOB</literal> in
MySQL
-    4.1 and up, and <literal>CHAR BINARY</literal>, <literal>VARCHAR
-    BINARY</literal>, and <literal>BLOB</literal> in MySQL 4.0. This
-    option was added in MySQL 4.0.23 and 4.1.8.
+    affected columns in MySQL 5.0 are <literal>BINARY</literal>,
+    <literal>VARBINARY</literal>, <literal>BLOB</literal>.
    </para></listitem>
 
    <listitem><para>
@@ -5335,7 +4785,7 @@
     Lock all tables across all databases. This is achieved by acquiring
     a global read lock for the duration of the whole dump. This option
     automatically turns off <literal>--single-transaction</literal> and
-    <literal>--lock-tables</literal>. Added in MySQL 4.1.8.
+    <literal>--lock-tables</literal>.
    </para></listitem>
 
    <listitem><para>
@@ -5375,8 +4825,6 @@
     value is equal to 2, the <literal>CHANGE MASTER</literal> statement
     is written as an SQL comment. This is the default action if
     <replaceable>value</replaceable> is omitted.
-    <replaceable>value</replaceable> may be given as of MySQL 4.1.8;
-    before that, do not specify an option value.
    </para>
 
    <para>
@@ -5406,7 +4854,7 @@
    </para>
 
    <para>
-    Don't write <literal>CREATE TABLE</literal> statements that
+    Do not write <literal>CREATE TABLE</literal> statements that
     re-create each dumped table.
    </para></listitem>
 
@@ -5415,7 +4863,7 @@
    </para>
 
    <para>
-    Don't write any row information for the table. This is very useful
+    Do not write any row information for the table. This is very useful
     if you just want to get a dump of the structure for a table.
    </para></listitem>
 
@@ -5429,7 +4877,7 @@
     --disable-keys --extended-insert --lock-tables --quick
     --set-charset</literal>. It should give you a fast dump operation
     and produce a dump file that can be reloaded into a MySQL server
-    quickly. <emphasis role="bold">As of MySQL 4.1,
+    quickly. <emphasis role="bold">In MySQL 5.0,
     <literal>--opt</literal> is on by default, but can be disabled with
     <literal>--skip-opt</literal></emphasis>. To disable only certain
of
     the options enabled by <literal>--opt</literal>, use their
@@ -5466,7 +4914,7 @@
    </para>
 
    <para>
-    The connection protocol to use. New in MySQL 4.1.
+    The connection protocol to use.
    </para></listitem>
 
    <listitem><para>
@@ -5488,7 +4936,7 @@
     Quote database, table, and column names within
     '<literal>`</literal>' characters. If the server SQL mode includes
     the <literal>ANSI_QUOTES</literal> option, names are quoted within
-    '<literal>"</literal>' characters. As of MySQL 4.1.1,
+    '<literal>"</literal>' characters. In MySQL 5.0,
     <literal>--quote-names</literal> is on by default, but can be
     disabled with <literal>--skip-quote-names</literal>.
    </para></listitem>
@@ -5514,8 +4962,7 @@
     <replaceable>default_character_set</replaceable></literal> to the
     output. This option is enabled by default. To suppress the
     <literal>SET NAMES</literal> statement, use
-    <literal>--skip-set-charset</literal>. This option was added in
-    MySQL 4.1.2.
+    <literal>--skip-set-charset</literal>.
    </para></listitem>
 
    <listitem><para>
@@ -5540,11 +4987,10 @@
    </para>
 
    <para>
-    The <literal>--single-transaction</literal> option was added in
-    MySQL 4.0.2. This option is mutually exclusive with the
-    <literal>--lock-tables</literal> option, because <literal>LOCK
-    TABLES</literal> causes any pending transactions to be committed
-    implicitly.
+    The <literal>--single-transaction</literal> option and the
+    <literal>--lock-tables</literal> option are mutually exclusive, 
+    because <literal>LOCK TABLES</literal> causes any pending 
+    transactions to be committed implicitly.
    </para>
 
    <para>
@@ -5684,9 +5130,8 @@
    </para>
 
    <para>
-    The maximum size of the buffer for client/server communication. The
-    value of the variable can be up to 16MB before MySQL 4.0, and up to
-    1GB from MySQL 4.0 on.
+    The maximum size of the buffer for client/server communication. In 
+    MySQL 5.0, the value of this variable can be up to 1GB.
    </para></listitem>
 
    <listitem><para>
@@ -5711,7 +5156,7 @@
   
<literal>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
    or <literal>-O
   
<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
-   syntax. However, this syntax is deprecated as of MySQL 4.0.
+   syntax. However, this syntax now deprecated.
   </para>
 
   <para>
@@ -5801,10 +5246,9 @@
 
   <para>
    The simultaneous use of <literal>--master-data</literal> and
-   <literal>--single-transaction</literal> works as of MySQL 4.1.8. It
-   provides a convenient way to make an online backup suitable for
-   point-in-time recovery, if tables are stored in the
-   <literal>InnoDB</literal> storage engine.
+   <literal>--single-transaction</literal> provides a convenient way to 
+   make an online backup suitable for point-in-time recovery, if tables 
+   are stored in the <literal>InnoDB</literal> storage engine.
   </para>
 
   <para>
@@ -5817,9 +5261,10 @@
 
   <title id='title-mysqlhotcopy'>&title-mysqlhotcopy;</title>
 
-<!--  TODO: need *general* mysqlhotcopy invocation syntax. Only specific -->
-
-<!--  examples are given here. -->
+<!--  
+      TODO: need *general* mysqlhotcopy invocation syntax. Only specific 
+      examples are given here. 
+-->
 
   <indexterm type="concept">
    <primary>dumping</primary>
@@ -5850,8 +5295,7 @@
    database or single tables, but it can be run only on the same machine
    where the database directories are located.
    <command>mysqlhotcopy</command> works only for backing up
-   <literal>MyISAM</literal> and <literal>ISAM</literal> tables.
It runs
-   on Unix, and as of MySQL 4.0.18 also on NetWare.
+   <literal>MyISAM</literal>. It runs on Unix and NetWare.
   </para>
 
 <!--  TODO: explain what these examples mean -->
@@ -5900,7 +5344,7 @@
    </para>
 
    <para>
-    Don't abort if target exists (rename it by adding an
+    Do not abort if target exists (rename it by adding an
     <literal>_old</literal> suffix).
    </para></listitem>
 
@@ -5926,7 +5370,7 @@
    </para>
 
    <para>
-    Report actions without doing them.
+    Report actions without actually performing them.
    </para></listitem>
 
    <listitem><para>
@@ -5942,7 +5386,7 @@
    </para>
 
    <para>
-    Don't delete previous (renamed) target when done.
+    Do not delete previous (renamed) target when done.
    </para></listitem>
 
    <listitem><para>
@@ -5958,11 +5402,9 @@
    </para>
 
    <para>
-    Don't include full index files in the backup. This makes the backup
+    Do not include full index files in the backup. This makes the backup
     smaller and faster. The indexes can be reconstructed later with
-    <command>myisamchk -rq</command> for
<literal>MyISAM</literal>
-    tables or <command>isamchk -rq</command> for
<literal>ISAM</literal>
-    tables.
+    <command>myisamchk -rq</command>.
    </para></listitem>
 
    <listitem><para>
@@ -6281,7 +5723,7 @@
     <literal>--replace</literal>, new rows replace existing rows that
     have the same unique key value. If you specify
     <literal>--ignore</literal>, input rows that duplicate an existing
-    row on a unique key value are skipped. If you don't specify either
+    row on a unique key value are skipped. If you do not specify either
     option, an error occurs when a duplicate key value is found, and the
     rest of the text file is ignored.
    </para></listitem>
@@ -6551,7 +5993,7 @@
    </para>
 
    <para>
-    The connection protocol to use. New in MySQL 4.1.
+    The connection protocol to use.
    </para></listitem>
 
    <listitem><para>
Thread
bk commit - mysqldoc@docsrva tree (jon:1.3064)jon19 Jul