List:Internals« Previous MessageNext Message »
From:paul Date:July 8 2005 2:02am
Subject:bk commit - mysqldoc@docsrva tree (paul:1.2957)
View as plain text  
Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul 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.2957 05/07/07 21:02:01 paul@stripped +9 -0
  Reformat.

  refman/news.xml
    1.45 05/07/07 21:01:59 paul@stripped +153 -184
    Reformat.

  refman/mysql-database-administration.xml
    1.17 05/07/07 21:01:59 paul@stripped +268 -265
    Reformat.

  refman/installing.xml
    1.10 05/07/07 21:01:59 paul@stripped +82 -67
    Reformat.

  refman-5.0/news.xml
    1.40 05/07/07 21:01:59 paul@stripped +204 -229
    Reformat.

  refman-5.0/mysql-database-administration.xml
    1.19 05/07/07 21:01:58 paul@stripped +724 -690
    Reformat.

  refman-5.0/installing.xml
    1.12 05/07/07 21:01:58 paul@stripped +81 -66
    Reformat.

  refman-4.1/news.xml
    1.36 05/07/07 21:01:57 paul@stripped +36 -44
    Reformat.

  refman-4.1/mysql-database-administration.xml
    1.13 05/07/07 21:01:57 paul@stripped +230 -227
    Reformat.

  refman-4.1/installing.xml
    1.10 05/07/07 21:01:57 paul@stripped +79 -64
    Reformat.

# 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:	paul
# Host:	frost.snake.net
# Root:	/Volumes/frost2/MySQL/bk/mysqldoc

--- 1.9/refman-4.1/installing.xml	2005-07-07 15:49:22 -05:00
+++ 1.10/refman-4.1/installing.xml	2005-07-07 21:01:57 -05:00
@@ -7657,54 +7657,66 @@
      <ulink url="http://www.bitmover.com/bk-client.shar">http://www.bitmover.com/bk-client.shar</ulink>.
     </para></listitem>
 
-    <listitem>
-     <para>
-      On Unix, install the free client like this:
-      <programlisting>
+    <listitem><para>
+     On Unix, install the free client like this:
+
+<programlisting>
 shell&gt; sh bk-client.shar
 shell&gt; cd bk_client-1.1
 shell&gt; make all
 shell&gt; PATH=$PWD:$PATH
       </programlisting>
-     </para>
-     <para>
-      On Windows, install it like this:
-      <itemizedlist>
-       <listitem><para>
-        Download and install Cygwin from 
-        <ulink url="http://cygwin.com/">http://cygwin.com</ulink>.
-       </para></listitem>
-       <listitem><para>
-        Make sure <literal>gcc</literal> has been installed under Cygwin.
-        You can test this by issuing <literal>which gcc</literal>. If it's not
-        installed, run Cygwin's package manager, select <literal>gcc</literal>,
-        and install it.
-       </para></listitem>
-       <listitem><para>
-        Under Cygwin, perform these steps:
-        <programlisting>
+    </para>
+
+    <para>
+     On Windows, install it like this:
+
+     <itemizedlist>
+
+      <listitem><para>
+       Download and install Cygwin from
+       <ulink url="http://cygwin.com/">http://cygwin.com</ulink>.
+      </para></listitem>
+
+      <listitem><para>
+       Make sure <literal>gcc</literal> has been installed under Cygwin.
+       You can test this by issuing <literal>which gcc</literal>. If
+       it's not installed, run Cygwin's package manager, select
+       <literal>gcc</literal>, and install it.
+      </para></listitem>
+
+      <listitem><para>
+       Under Cygwin, perform these steps:
+
+<programlisting>
 shell&gt; sh bk-client.shar
 shell&gt; cd bk_client-1.1
         </programlisting>
-        Then edit the <filename>Makefile</filename> and change the line that
-        reads <literal>$(CC) $(CFLAGS) -o sfio -lz sfio.c</literal> to this:
-        <programlisting>
+
+       Then edit the <filename>Makefile</filename> and change the line
+       that reads <literal>$(CC) $(CFLAGS) -o sfio -lz sfio.c</literal>
+       to this:
+
+<programlisting>
 $(CC) $(CFLAGS) -o sfio sfio.c -lz
         </programlisting>
-        Now run the <command>make</command> command and set the path:
-        <programlisting>
+
+       Now run the <command>make</command> command and set the path:
+
+<programlisting>
 shell&gt; make all
 shell&gt; PATH=$PWD:$PATH
         </programlisting>
-       </para></listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
+      </para></listitem>
+
+     </itemizedlist>
+    </para></listitem>
 
     <listitem><para>
-     After the BitKeeper free client has been installed, first go to the 
-     directory you want to work from, and then use one of the following commands 
-     to make a local copy of the MySQL version branch of your choice:
+     After the BitKeeper free client has been installed, first go to the
+     directory you want to work from, and then use one of the following
+     commands to make a local copy of the MySQL version branch of your
+     choice:
     </para>
 
     <para>
@@ -7741,13 +7753,13 @@
 
     <para>
      Normally, you don't have to build the documentation yourself,
-     because we're providing it in various formats on 
+     because we're providing it in various formats on
      <ulink url="http://dev.mysql.com/doc/">http://dev.mysql.com/doc</ulink>.
-     The formats you can download there (HTML, PDF, etc.) are being built on
-     a daily basis, so you gain little by creating them yourself from the
-     DocBook XML base format in the <literal>mysqldoc</literal> tree.
-     If you would like to copy the documentation repository, anyway,
-     use the following command:
+     The formats you can download there (HTML, PDF, etc.) are being
+     built on a daily basis, so you gain little by creating them
+     yourself from the DocBook XML base format in the
+     <literal>mysqldoc</literal> tree. If you would like to copy the
+     documentation repository, anyway, use the following command:
     </para>
 
 <programlisting>
@@ -7771,7 +7783,7 @@
      variable <literal>http_proxy</literal> to point to your proxy:
     </para>
 
-    <!--
+<!--
      SH: Check if bk:// can be substituted by http:// with the free client.
     -->
 
@@ -7794,9 +7806,10 @@
     </para></listitem>
 
     <listitem><para>
-     To update the local copy of a repository, use this command (the example
-     is for updating the 5.0 branch):
-     <programlisting>
+     To update the local copy of a repository, use this command (the
+     example is for updating the 5.0 branch):
+
+<programlisting>
 shell&gt; update bk://mysql.bkbits.net/mysql-5.0
      </programlisting>
     </para></listitem>
@@ -7954,29 +7967,31 @@
     </para></listitem>
 
     <listitem><para>
-     After the initial copying of the repository (<literal>sfioball</literal>)
-     to obtain the source tree, you should update the repository 
-     (<literal>update</literal>) periodically to get updates.
+     After the initial copying of the repository
+     (<literal>sfioball</literal>) to obtain the source tree, you should
+     update the repository (<literal>update</literal>) periodically to
+     get updates.
     </para></listitem>
 
     <listitem><para>
      You can examine the change history for the tree with all the diffs
      by viewing the <filename>BK/ChangeLog</filename> file in the source
-     tree and looking at the <literal>ChangeSet</literal> descriptions listed 
-     there. To examine a particular changeset, you would have to use the 
-     <command>sfioball</command> command to  extract two particular revisions 
-     of the source tree, then use an  external <command>diff</command> command 
-     to compare them. If you see some funny diffs
-     or code that you have a question about, do not hesitate to send
-     email to the MySQL <literal>internals</literal> mailing list. See
-     <xref linkend="mailing-list"/>. Also, if you think you have a
-     better idea on how to do something, send an email message to the
-     same address with a patch.
+     tree and looking at the <literal>ChangeSet</literal> descriptions
+     listed there. To examine a particular changeset, you would have to
+     use the <command>sfioball</command> command to extract two
+     particular revisions of the source tree, then use an external
+     <command>diff</command> command to compare them. If you see some
+     funny diffs or code that you have a question about, do not hesitate
+     to send email to the MySQL <literal>internals</literal> mailing
+     list. See <xref linkend="mailing-list"/>. Also, if you think you
+     have a better idea on how to do something, send an email message to
+     the same address with a patch.
     </para></listitem>
 
     <listitem><para>
      The BitKeeper free client is shipped with its source code. The only
-     documentation available for the free client is the source code itself.
+     documentation available for the free client is the source code
+     itself.
     </para></listitem>
 
    </orderedlist>
@@ -8727,8 +8742,8 @@
      </para></listitem>
 
      <listitem><para>
-      BitKeeper 3.0 installed on that system.
-      See <xref linkend="installing-source-tree"/> for instructions how to
+      BitKeeper 3.0 installed on that system. See
+      <xref linkend="installing-source-tree"/> for instructions how to
       download and install BitKeeper.
      </para></listitem>
 
@@ -8970,9 +8985,9 @@
     <orderedlist>
 
      <listitem><para>
-      Copy the BitKeeper source tree for MySQL (version 4.1 or above,
-      as desired). For more information on how To copy the source tree,
-      see the instructions at <xref linkend="installing-source-tree"/>.
+      Copy the BitKeeper source tree for MySQL (version 4.1 or above, as
+      desired). For more information on how To copy the source tree, see
+      the instructions at <xref linkend="installing-source-tree"/>.
      </para></listitem>
 
      <listitem><para>
@@ -12571,8 +12586,8 @@
     <listitem><para>
      <literal>AUTO_INCREMENT</literal> columns should not be used to
      store negative numbers. The reason for this is that negative
-     numbers caused problems when wrapping from -1 to 0. You should
-     not store 0 in <literal>AUTO_INCREMENT</literal> columns, either;
+     numbers caused problems when wrapping from -1 to 0. You should not
+     store 0 in <literal>AUTO_INCREMENT</literal> columns, either;
      <literal>CHECK TABLE</literal> complains about 0 values because
      they may change if you dump and restore the table.
      <literal>AUTO_INCREMENT</literal> for <literal>MyISAM</literal>

--- 1.12/refman-4.1/mysql-database-administration.xml	2005-07-06 12:00:02 -05:00
+++ 1.13/refman-4.1/mysql-database-administration.xml	2005-07-07 21:01:57 -05:00
@@ -39,208 +39,208 @@
   </para>
 
   <section id="server-side-overview">
-    
-    <title id='title-server-side-overview'>&title-server-side-overview;</title>
-    
+
+   <title id='title-server-side-overview'>&title-server-side-overview;</title>
+
+   <indexterm type="concept">
+    <primary>programs</primary>
+    <secondary>list of</secondary>
+   </indexterm>
+
+   <para>
+    All MySQL programs take many different options. However, every MySQL
+    program provides a <literal>--help</literal> option that you can use
+    to get a description of the program's options. For example, try
+    <command>mysqld --help</command>.
+   </para>
+
+   <para>
+    You can override default options for all standard programs by
+    specifying options on the command line or in an option file.
+    <xref linkend="program-options"/>.
+   </para>
+
+   <para>
+    The following list briefly describes the MySQL server and
+    server-related programs:
+   </para>
+
+   <itemizedlist>
+
     <indexterm type="concept">
-      <primary>programs</primary>
-      <secondary>list of</secondary>
+     <primary><command>mysqld</command></primary>
     </indexterm>
-    
+
+    <listitem><para>
+     <literal>mysqld</literal>
+    </para>
+
     <para>
-      All MySQL programs take many different options. However, every MySQL
-      program provides a <literal>--help</literal> option that you can use
-      to get a description of the program's options. For example, try
-      <command>mysqld --help</command>.
+     The SQL daemon (that is, the MySQL server). To use client programs,
+     this program must be running, because clients gain access to
+     databases by connecting to the server. See
+     <xref linkend="configuring-mysql"/>.
     </para>
-    
+
     <para>
-      You can override default options for all standard programs by
-      specifying options on the command line or in an option file.
-      <xref linkend="program-options"/>.
+     <indexterm type="concept">
+      <primary><command>mysqld-max</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysqld-max</literal>
     </para>
-    
+
     <para>
-      The following list briefly describes the MySQL server and
-      server-related programs:
+     A version of the server that includes additional features. See
+     <xref linkend="mysqld-max"/>.
     </para>
-    
-    <itemizedlist>
-      
-      <indexterm type="concept">
-        <primary><command>mysqld</command></primary>
-      </indexterm>
-      
-      <listitem><para>
-          <literal>mysqld</literal>
-        </para>
-        
-        <para>
-          The SQL daemon (that is, the MySQL server). To use client programs,
-          this program must be running, because clients gain access to
-          databases by connecting to the server. See
-          <xref linkend="configuring-mysql"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysqld-max</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysqld-max</literal>
-        </para>
-        
-        <para>
-          A version of the server that includes additional features. See
-          <xref linkend="mysqld-max"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysqld_safe</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysqld_safe</literal>
-        </para>
-        
-        <para>
-          A server startup script. <command>mysqld_safe</command> attempts to
-          start <command>mysqld-max</command> if it exists, and
-          <command>mysqld</command> otherwise. See
-          <xref linkend="mysqld-safe"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysql.server</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysql.server</literal>
-        </para>
-        
-        <para>
-          A server startup script. This script is used on systems that use
-          run directories containing scripts that start system services for
-          particular run levels. It invokes <command>mysqld_safe</command> to
-          start the MySQL server. See <xref linkend="mysql-server"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysqld_multi</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysqld_multi</literal>
-        </para>
-        
-        <para>
-          A server startup script that can start or stop multiple servers
-          installed on the system. See <xref linkend="mysqld-multi"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysql_install_db</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysql_install_db</literal>
-        </para>
-        
-        <para>
-          This script creates the MySQL grant tables with default privileges.
-          It is usually executed only once, when first installing MySQL on a
-          system. See <xref linkend="unix-post-installation"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysql_fix_privilege_tables</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysql_fix_privilege_tables</literal>
-        </para>
-        
-        <para>
-          This script is used after an upgrade install operation, to update
-          the grant tables with any changes that have been made in newer
-          versions of MySQL. See <xref linkend="upgrading-grant-tables"/>.
-        </para></listitem>
-      
-    </itemizedlist>
-    
+
     <para>
-      There are several other programs that also are run on the server
-      host:
+     <indexterm type="concept">
+      <primary><command>mysqld_safe</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysqld_safe</literal>
     </para>
-    
-    <!--  TODO: indicate where these are discussed -->
-    
-    <itemizedlist>
-      
-      <indexterm type="concept">
-        <primary><command>myisamchk</command></primary>
-      </indexterm>
-      
-      <listitem><para>
-          <literal>myisamchk</literal>
-        </para>
-        
-        <para>
-          A utility to describe, check, optimize, and repair
-          <literal>MyISAM</literal> tables. <command>myisamchk</command> is
-          described in <xref linkend="table-maintenance"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>make_binary_distribution</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>make_binary_distribution</literal>
-        </para>
-        
-        <para>
-          This program makes a binary release of a compiled MySQL. This could
-          be sent by FTP to <filename>/pub/mysql/upload/</filename> on
-          <literal>ftp.mysql.com</literal> for the convenience of other MySQL
-          users.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysqlbug</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysqlbug</literal>
-        </para>
-        
-        <para>
-          The MySQL bug reporting script. It can be used to send a bug report
-          to the MySQL mailing list. (You can also visit
-          <ulink url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>
-          to file a bug report online. See <xref linkend="bug-reports"/>.)
-        </para></listitem>
-      
-    </itemizedlist>
-    
+
+    <para>
+     A server startup script. <command>mysqld_safe</command> attempts to
+     start <command>mysqld-max</command> if it exists, and
+     <command>mysqld</command> otherwise. See
+     <xref linkend="mysqld-safe"/>.
+    </para>
+
+    <para>
+     <indexterm type="concept">
+      <primary><command>mysql.server</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysql.server</literal>
+    </para>
+
+    <para>
+     A server startup script. This script is used on systems that use
+     run directories containing scripts that start system services for
+     particular run levels. It invokes <command>mysqld_safe</command> to
+     start the MySQL server. See <xref linkend="mysql-server"/>.
+    </para>
+
+    <para>
+     <indexterm type="concept">
+      <primary><command>mysqld_multi</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysqld_multi</literal>
+    </para>
+
+    <para>
+     A server startup script that can start or stop multiple servers
+     installed on the system. See <xref linkend="mysqld-multi"/>.
+    </para>
+
+    <para>
+     <indexterm type="concept">
+      <primary><command>mysql_install_db</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysql_install_db</literal>
+    </para>
+
+    <para>
+     This script creates the MySQL grant tables with default privileges.
+     It is usually executed only once, when first installing MySQL on a
+     system. See <xref linkend="unix-post-installation"/>.
+    </para>
+
+    <para>
+     <indexterm type="concept">
+      <primary><command>mysql_fix_privilege_tables</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysql_fix_privilege_tables</literal>
+    </para>
+
+    <para>
+     This script is used after an upgrade install operation, to update
+     the grant tables with any changes that have been made in newer
+     versions of MySQL. See <xref linkend="upgrading-grant-tables"/>.
+    </para></listitem>
+
+   </itemizedlist>
+
+   <para>
+    There are several other programs that also are run on the server
+    host:
+   </para>
+
+<!--  TODO: indicate where these are discussed -->
+
+   <itemizedlist>
+
+    <indexterm type="concept">
+     <primary><command>myisamchk</command></primary>
+    </indexterm>
+
+    <listitem><para>
+     <literal>myisamchk</literal>
+    </para>
+
+    <para>
+     A utility to describe, check, optimize, and repair
+     <literal>MyISAM</literal> tables. <command>myisamchk</command> is
+     described in <xref linkend="table-maintenance"/>.
+    </para>
+
+    <para>
+     <indexterm type="concept">
+      <primary><command>make_binary_distribution</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>make_binary_distribution</literal>
+    </para>
+
+    <para>
+     This program makes a binary release of a compiled MySQL. This could
+     be sent by FTP to <filename>/pub/mysql/upload/</filename> on
+     <literal>ftp.mysql.com</literal> for the convenience of other MySQL
+     users.
+    </para>
+
+    <para>
+     <indexterm type="concept">
+      <primary><command>mysqlbug</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysqlbug</literal>
+    </para>
+
+    <para>
+     The MySQL bug reporting script. It can be used to send a bug report
+     to the MySQL mailing list. (You can also visit
+     <ulink url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>
+     to file a bug report online. See <xref linkend="bug-reports"/>.)
+    </para></listitem>
+
+   </itemizedlist>
+
   </section>
-  
+
   <section id="mysqld-max">
 
    <title id='title-mysqld-max'>&title-mysqld-max;</title>
@@ -2954,8 +2954,8 @@
     <para>
      Log updates to <replaceable>file#</replaceable> where
      <replaceable>#</replaceable> is a unique number if not given. See
-     <xref linkend="update-log"/>. The update log is now deprecated; you 
-     should use the binary log instead (<literal>--log-bin</literal>). 
+     <xref linkend="update-log"/>. The update log is now deprecated; you
+     should use the binary log instead (<literal>--log-bin</literal>).
      See <xref linkend="binary-log"/>.
     </para></listitem>
 
@@ -4043,8 +4043,7 @@
      DIRECTORY</literal> and <literal>DATA DIRECTORY</literal>
      directives. This option is useful on slave replication servers.
      (New in MySQL 4.0.15)
-    </para>
-    </listitem>
+    </para></listitem>
 
     <listitem><para>
      <literal>NO_ENGINE_SUBSTITUTION</literal>
@@ -9985,18 +9984,20 @@
      The number of physical writes of a key block to disk.
     </para></listitem>
 
-    <listitem>
-      <para><literal>Last_query_cost</literal></para>
+    <listitem><para>
+     <literal>Last_query_cost</literal>
+    </para>
 
-      <para>The total cost of the last compiled query as computed by the
-      query optimizer. Useful for comparing the cost of different query
-      plans for the same query. The default value of 0 means that no
-      query has been compiled yet. This variable was added in MySQL
-      5.0.1, with a default value of -1. In MySQL 5.0.7, the default was
-      changed to 0; also in version 5.0.7, the scope of
-      <literal>Last_query_cost</literal> was changed to session rather
-      than a global.</para>
-    </listitem>
+    <para>
+     The total cost of the last compiled query as computed by the query
+     optimizer. Useful for comparing the cost of different query plans
+     for the same query. The default value of 0 means that no query has
+     been compiled yet. This variable was added in MySQL 5.0.1, with a
+     default value of -1. In MySQL 5.0.7, the default was changed to 0;
+     also in version 5.0.7, the scope of
+     <literal>Last_query_cost</literal> was changed to session rather
+     than a global.
+    </para></listitem>
 
     <listitem><para>
      <literal>Max_used_connections</literal>
@@ -13384,20 +13385,23 @@
     </para></listitem>
 
     <listitem><para>
-     Note: The netmask can only be used to tell the server to
-     use 8, 16, 24, or 32 bits of the address, for example:
-     <programlisting>
+     Note: The netmask can only be used to tell the server to use 8, 16,
+     24, or 32 bits of the address, for example:
+
+<programlisting>
 192.0.0.0/255.0.0.0 (anything on the 192 class A network)
 192.168.0.0/255.255.0.0 (anything on the 192.168 class B network)
 192.168.1.0/255.255.255.0 (anything on the 192.168.1 class C network)
 192.168.1.1 (only this specific IP) 
      </programlisting>
+
      The following netmask (28 bits) will not work:
-     <programlisting>
+
+<programlisting>
 192.168.0.1/255.255.255.240
      </programlisting>
-    </para></listitem> 
-    
+    </para></listitem>
+
     <listitem><para>
      A blank <literal>Host</literal> value in a <literal>db</literal>
      table record means that its privileges should be combined with
@@ -15467,17 +15471,16 @@
     </para></listitem>
 
     <listitem><para>
-     MySQL usernames can be up to 16 characters long.
-     Changing the maximum length is not supported. If you still try to
-     change it, for example by changing the length of the
-     <literal>User</literal> column in the <literal>mysql</literal>
-     database tables, this will likely result in strange and unpredictable 
-     effects. (Altering privilege tables isn't supported, anyway.)
-     Operating system
+     MySQL usernames can be up to 16 characters long. Changing the
+     maximum length is not supported. If you still try to change it, for
+     example by changing the length of the <literal>User</literal>
+     column in the <literal>mysql</literal> database tables, this will
+     likely result in strange and unpredictable effects. (Altering
+     privilege tables isn't supported, anyway.) Operating system
      usernames might have a different maximum length. For example, Unix
      usernames typically are limited to eight characters.
-    </para></listitem> 
-    
+    </para></listitem>
+
     <listitem><para>
      MySQL passwords have nothing to do with passwords for logging in to
      your operating system. There is no necessary connection between the
@@ -20498,8 +20501,8 @@
       one-character to two-character mapping is not done. All letters
       are converted to uppercase. Accents are removed from all letters
       except <literal>Ü</literal>, <literal>ü</literal>,
-      <literal>Ö</literal>, <literal>ö</literal>, <literal>Ä</literal>,
-      and <literal>ä</literal>.
+      <literal>Ö</literal>, <literal>ö</literal>,
+      <literal>Ä</literal>, and <literal>ä</literal>.
      </para></listitem>
 
     </itemizedlist>
@@ -23037,10 +23040,10 @@
   </para>
 
   <para>
-   <emphasis role="bold">Note</emphasis>: The query cache isn't used
-   for server-side prepared statements. If you're using server-side prepared 
-   statements consider that these statement won't be satisfied by the query
-   cache. See <xref linkend="c-api-prepared-statements"/>.
+   <emphasis role="bold">Note</emphasis>: The query cache isn't used for
+   server-side prepared statements. If you're using server-side prepared
+   statements consider that these statement won't be satisfied by the
+   query cache. See <xref linkend="c-api-prepared-statements"/>.
   </para>
 
   <para>

--- 1.35/refman-4.1/news.xml	2005-07-07 08:42:48 -05:00
+++ 1.36/refman-4.1/news.xml	2005-07-07 21:01:57 -05:00
@@ -264,39 +264,31 @@
 <!-- NOTE: No need to start every item with "Fixed..."; sufficient to
      describe the  issue that was fixed. Use past tense. -->
 
-    <listitem>
-      <para>
-        Incorrect results when searching using <literal>IN()</literal>
-        where search items include <literal>NULL</literal> and
-        <literal>0</literal>. (Bug #9393)
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        NDB Cluster: When trying to open a table that could not be 
-        discovered or unpacked, cluster would return error codes which 
-        the MySQL server falsely interpreted as operating system errors. 
-        (Bug #103651)
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        Manually inserting a row with <literal>host=''</literal> into 
-        <literal>mysql.tables_priv</literal> and performing a 
-        <literal>FLUSH PRIVILEGES</literal> would cause the server to 
-        crash. (Bug #11330)
-      </para>
-    </listitem>
-
-    <listitem>
-      <para>
-        MySQL sometimes reported erroneously that certain character 
-        values had crashed a table when trying to convert other 
-        character sets to UTF-8. (Bug #9557)
-      </para>
-    </listitem>
+    <listitem><para>
+     Incorrect results when searching using <literal>IN()</literal>
+     where search items include <literal>NULL</literal> and
+     <literal>0</literal>. (Bug #9393)
+    </para></listitem>
+
+    <listitem><para>
+     NDB Cluster: When trying to open a table that could not be
+     discovered or unpacked, cluster would return error codes which the
+     MySQL server falsely interpreted as operating system errors. (Bug
+     #103651)
+    </para></listitem>
+
+    <listitem><para>
+     Manually inserting a row with <literal>host=''</literal> into
+     <literal>mysql.tables_priv</literal> and performing a
+     <literal>FLUSH PRIVILEGES</literal> would cause the server to
+     crash. (Bug #11330)
+    </para></listitem>
+
+    <listitem><para>
+     MySQL sometimes reported erroneously that certain character values
+     had crashed a table when trying to convert other character sets to
+     UTF-8. (Bug #9557)
+    </para></listitem>
 
     <listitem><para>
      Using <literal>CONCAT_WS()</literal> on a column set <literal>NOT
@@ -779,9 +771,9 @@
      isolation level of the transaction is not set to serializable then
      <literal>InnoDB</literal> uses a consistent read for select in
      clauses like <literal>INSERT INTO…SELECT</literal> and
-     <literal>UPDATE…(SELECT)</literal> that do not specify <literal>FOR
-     UPDATE</literal> or <literal>IN SHARE MODE</literal>. Thus no locks
-     are set to rows read from selected table.
+     <literal>UPDATE…(SELECT)</literal> that do not specify
+     <literal>FOR UPDATE</literal> or <literal>IN SHARE MODE</literal>.
+     Thus no locks are set to rows read from selected table.
     </para></listitem>
 
     <listitem><para>
@@ -2122,8 +2114,8 @@
     </para></listitem>
 
     <listitem><para>
-     InnoDB: Relaxed locking in <literal>INSERT…SELECT</literal>, single
-     table <literal>UPDATE…SELECT</literal> and single table
+     InnoDB: Relaxed locking in <literal>INSERT…SELECT</literal>,
+     single table <literal>UPDATE…SELECT</literal> and single table
      <literal>DELETE…SELECT</literal> clauses when
      <literal>innodb_locks_unsafe_for_binlog</literal> is used and
      isolation level of the transaction is not serializable.
@@ -3375,9 +3367,9 @@
     </para></listitem>
 
     <listitem><para>
-     InnoDB: Fixed a bug in <literal>LOAD DATA INFILE…REPLACE</literal>
-     printing duplicate key error when executing the same load query
-     several times. (Bug #5835)
+     InnoDB: Fixed a bug in <literal>LOAD DATA
+     INFILE…REPLACE</literal> printing duplicate key error when
+     executing the same load query several times. (Bug #5835)
     </para></listitem>
 
     <listitem><para>
@@ -7311,9 +7303,9 @@
     </para></listitem>
 
     <listitem><para>
-     InnoDB: Fixed a bug in <literal>LOAD DATA INFILE…REPLACE</literal>
-     printing duplicate key error when executing the same load query
-     several times. (Bug #5835)
+     InnoDB: Fixed a bug in <literal>LOAD DATA
+     INFILE…REPLACE</literal> printing duplicate key error when
+     executing the same load query several times. (Bug #5835)
     </para></listitem>
 
     <listitem><para>

--- 1.11/refman-5.0/installing.xml	2005-07-07 20:57:21 -05:00
+++ 1.12/refman-5.0/installing.xml	2005-07-07 21:01:58 -05:00
@@ -7657,54 +7657,66 @@
      <ulink url="http://www.bitmover.com/bk-client.shar">http://www.bitmover.com/bk-client.shar</ulink>.
     </para></listitem>
 
-    <listitem>
-     <para>
-      On Unix, install the free client like this:
-      <programlisting>
+    <listitem><para>
+     On Unix, install the free client like this:
+
+<programlisting>
 shell&gt; sh bk-client.shar
 shell&gt; cd bk_client-1.1
 shell&gt; make all
 shell&gt; PATH=$PWD:$PATH
       </programlisting>
-     </para>
-     <para>
-      On Windows, install it like this:
-      <itemizedlist>
-       <listitem><para>
-        Download and install Cygwin from 
-        <ulink url="http://cygwin.com/">http://cygwin.com</ulink>.
-       </para></listitem>
-       <listitem><para>
-        Make sure <literal>gcc</literal> has been installed under Cygwin.
-        You can test this by issuing <literal>which gcc</literal>. If it's not
-        installed, run Cygwin's package manager, select <literal>gcc</literal>,
-        and install it.
-       </para></listitem>
-       <listitem><para>
-        Under Cygwin, perform these steps:
-        <programlisting>
+    </para>
+
+    <para>
+     On Windows, install it like this:
+
+     <itemizedlist>
+
+      <listitem><para>
+       Download and install Cygwin from
+       <ulink url="http://cygwin.com/">http://cygwin.com</ulink>.
+      </para></listitem>
+
+      <listitem><para>
+       Make sure <literal>gcc</literal> has been installed under Cygwin.
+       You can test this by issuing <literal>which gcc</literal>. If
+       it's not installed, run Cygwin's package manager, select
+       <literal>gcc</literal>, and install it.
+      </para></listitem>
+
+      <listitem><para>
+       Under Cygwin, perform these steps:
+
+<programlisting>
 shell&gt; sh bk-client.shar
 shell&gt; cd bk_client-1.1
         </programlisting>
-        Then edit the <filename>Makefile</filename> and change the line that
-        reads <literal>$(CC) $(CFLAGS) -o sfio -lz sfio.c</literal> to this:
-        <programlisting>
+
+       Then edit the <filename>Makefile</filename> and change the line
+       that reads <literal>$(CC) $(CFLAGS) -o sfio -lz sfio.c</literal>
+       to this:
+
+<programlisting>
 $(CC) $(CFLAGS) -o sfio sfio.c -lz
         </programlisting>
-        Now run the <command>make</command> command and set the path:
-        <programlisting>
+
+       Now run the <command>make</command> command and set the path:
+
+<programlisting>
 shell&gt; make all
 shell&gt; PATH=$PWD:$PATH
         </programlisting>
-       </para></listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
+      </para></listitem>
+
+     </itemizedlist>
+    </para></listitem>
 
     <listitem><para>
-     After the BitKeeper free client has been installed, first go to the 
-     directory you want to work from, and then use one of the following commands 
-     to make a local copy of the MySQL version branch of your choice:
+     After the BitKeeper free client has been installed, first go to the
+     directory you want to work from, and then use one of the following
+     commands to make a local copy of the MySQL version branch of your
+     choice:
     </para>
 
     <para>
@@ -7741,13 +7753,13 @@
 
     <para>
      Normally, you don't have to build the documentation yourself,
-     because we're providing it in various formats on 
+     because we're providing it in various formats on
      <ulink url="http://dev.mysql.com/doc/">http://dev.mysql.com/doc</ulink>.
-     The formats you can download there (HTML, PDF, etc.) are being built on
-     a daily basis, so you gain little by creating them yourself from the
-     DocBook XML base format in the <literal>mysqldoc</literal> tree.
-     If you would like to copy the documentation repository, anyway,
-     use the following command:
+     The formats you can download there (HTML, PDF, etc.) are being
+     built on a daily basis, so you gain little by creating them
+     yourself from the DocBook XML base format in the
+     <literal>mysqldoc</literal> tree. If you would like to copy the
+     documentation repository, anyway, use the following command:
     </para>
 
 <programlisting>
@@ -7771,7 +7783,7 @@
      variable <literal>http_proxy</literal> to point to your proxy:
     </para>
 
-    <!--
+<!--
      SH: Check if bk:// can be substituted by http:// with the free client.
     -->
 
@@ -7794,9 +7806,10 @@
     </para></listitem>
 
     <listitem><para>
-     To update the local copy of a repository, use this command (the example
-     is for updating the 5.0 branch):
-     <programlisting>
+     To update the local copy of a repository, use this command (the
+     example is for updating the 5.0 branch):
+
+<programlisting>
 shell&gt; update bk://mysql.bkbits.net/mysql-5.0
      </programlisting>
     </para></listitem>
@@ -7954,29 +7967,31 @@
     </para></listitem>
 
     <listitem><para>
-     After the initial copying of the repository (<literal>sfioball</literal>)
-     to obtain the source tree, you should update the repository 
-     (<literal>update</literal>) periodically to get updates.
+     After the initial copying of the repository
+     (<literal>sfioball</literal>) to obtain the source tree, you should
+     update the repository (<literal>update</literal>) periodically to
+     get updates.
     </para></listitem>
 
     <listitem><para>
      You can examine the change history for the tree with all the diffs
      by viewing the <filename>BK/ChangeLog</filename> file in the source
-     tree and looking at the <literal>ChangeSet</literal> descriptions listed 
-     there. To examine a particular changeset, you would have to use the 
-     <command>sfioball</command> command to  extract two particular revisions 
-     of the source tree, then use an  external <command>diff</command> command 
-     to compare them. If you see some funny diffs
-     or code that you have a question about, do not hesitate to send
-     email to the MySQL <literal>internals</literal> mailing list. See
-     <xref linkend="mailing-list"/>. Also, if you think you have a
-     better idea on how to do something, send an email message to the
-     same address with a patch.
+     tree and looking at the <literal>ChangeSet</literal> descriptions
+     listed there. To examine a particular changeset, you would have to
+     use the <command>sfioball</command> command to extract two
+     particular revisions of the source tree, then use an external
+     <command>diff</command> command to compare them. If you see some
+     funny diffs or code that you have a question about, do not hesitate
+     to send email to the MySQL <literal>internals</literal> mailing
+     list. See <xref linkend="mailing-list"/>. Also, if you think you
+     have a better idea on how to do something, send an email message to
+     the same address with a patch.
     </para></listitem>
 
     <listitem><para>
      The BitKeeper free client is shipped with its source code. The only
-     documentation available for the free client is the source code itself.
+     documentation available for the free client is the source code
+     itself.
     </para></listitem>
 
    </orderedlist>
@@ -8727,8 +8742,8 @@
      </para></listitem>
 
      <listitem><para>
-      BitKeeper 3.0 installed on that system.
-      See <xref linkend="installing-source-tree"/> for instructions how to
+      BitKeeper 3.0 installed on that system. See
+      <xref linkend="installing-source-tree"/> for instructions how to
       download and install BitKeeper.
      </para></listitem>
 
@@ -8970,9 +8985,9 @@
     <orderedlist>
 
      <listitem><para>
-      Copy the BitKeeper source tree for MySQL (version 4.1 or above,
-      as desired). For more information on how To copy the source tree,
-      see the instructions at <xref linkend="installing-source-tree"/>.
+      Copy the BitKeeper source tree for MySQL (version 4.1 or above, as
+      desired). For more information on how To copy the source tree, see
+      the instructions at <xref linkend="installing-source-tree"/>.
      </para></listitem>
 
      <listitem><para>
@@ -11346,10 +11361,10 @@
     </para></listitem>
 
     <listitem><para>
-  In MySQL 5.0.6, binary logging of stored routines and triggers was
-  changed. This change has implications for security, replication, and
-  data recovery, as discussed in
-  <xref linkend="stored-procedure-logging"/>.
+     In MySQL 5.0.6, binary logging of stored routines and triggers was
+     changed. This change has implications for security, replication,
+     and data recovery, as discussed in
+     <xref linkend="stored-procedure-logging"/>.
     </para></listitem>
 
    </itemizedlist>

--- 1.18/refman-5.0/mysql-database-administration.xml	2005-07-07 20:56:41 -05:00
+++ 1.19/refman-5.0/mysql-database-administration.xml	2005-07-07 21:01:58 -05:00
@@ -319,9 +319,9 @@
 
     <para>
      This option enables support for the InnoDB storage engine.
-     MySQL-Max servers always include InnoDB support. From MySQL 4.0 
-     onwards, InnoDB is included by default in all binary distributions, 
-     so you do not need a MySQL-Max server merely to obtain InnoDB 
+     MySQL-Max servers always include InnoDB support. From MySQL 4.0
+     onwards, InnoDB is included by default in all binary distributions,
+     so you do not need a MySQL-Max server merely to obtain InnoDB
      support.
     </para></listitem>
 
@@ -340,8 +340,8 @@
 
     <para>
      This define is enabled to turn on database symbolic link support
-     for Windows. In MySQL 5.0, symbolic link support is available 
-     for all Windows servers, so a Max server is not needed to take 
+     for Windows. In MySQL 5.0, symbolic link support is available for
+     all Windows servers, so a Max server is not needed to take
      advantage of this feature.
     </para></listitem>
 
@@ -350,11 +350,11 @@
     </para>
 
     <para>
-     This option enables support for the NDB Cluster storage engine. 
-     Currently (as of &current-version;), Cluster is supported on Linux, 
-     Solaris, and Mac OS X only. Some users have reported success in 
-     using MySQL Cluster built from source on BSD operating systems, 
-     but these are not officially supported at this time.
+     This option enables support for the NDB Cluster storage engine.
+     Currently (as of &current-version;), Cluster is supported on Linux,
+     Solaris, and Mac OS X only. Some users have reported success in
+     using MySQL Cluster built from source on BSD operating systems, but
+     these are not officially supported at this time.
     </para></listitem>
 
    </itemizedlist>
@@ -382,7 +382,7 @@
    </para>
 
    <para>
-    The following table shows on which platforms MySQL-Max binaries 
+    The following table shows on which platforms MySQL-Max binaries
     include support for BDB and/or NDB Cluster:
    </para>
 
@@ -672,7 +672,7 @@
     log file should contain a reason indicating why the option is
     disabled.
    </para>
-   
+
    <para>
     You might also see <literal>DISABLED</literal> for the
     <literal>InnoDB</literal>, <literal>BDB</literal>, or
@@ -683,7 +683,7 @@
    </para>
 
    <para>
-    All MySQL servers support <literal>MyISAM</literal> tables, because 
+    All MySQL servers support <literal>MyISAM</literal> tables, because
     <literal>MyISAM</literal> is the default storage engine.
    </para>
 
@@ -725,10 +725,10 @@
    </para>
 
    <para>
-    <emphasis role="bold">Note</emphasis>: To preserve backward 
-    compatibility with older versions of MySQL, MySQL binary 
-    distributions still include <command>safe_mysqld</command> as a 
-    symbolic link to <command>mysqld_safe</command>. However, you should 
+    <emphasis role="bold">Note</emphasis>: To preserve backward
+    compatibility with older versions of MySQL, MySQL binary
+    distributions still include <command>safe_mysqld</command> as a
+    symbolic link to <command>mysqld_safe</command>. However, you should
     not rely on this as it almost certainly will be removed in future.
    </para>
 
@@ -791,7 +791,7 @@
     <literal>[mysqld_safe]</literal> sections in option files. For
     backward compatibility, it also reads
     <literal>[safe_mysqld]</literal> sections, although you should
-    rename such sections to <literal>[mysqld_safe]</literal> in MySQL 
+    rename such sections to <literal>[mysqld_safe]</literal> in MySQL
     5.0.
    </para>
 
@@ -1138,7 +1138,7 @@
     <literal>[mysql.server]</literal> and <literal>[mysqld]</literal>
     sections of option files. (For backward compatibility, it also reads
     <literal>[mysql_server]</literal> sections, although you should
-    rename such sections to <literal>[mysql.server]</literal> when using 
+    rename such sections to <literal>[mysql.server]</literal> when using
     MySQL 5.0.)
    </para>
 
@@ -1578,9 +1578,9 @@
      Beware of the dangers of using multiple <command>mysqld</command>
      servers with the same data directory. Use separate data
      directories, unless you <emphasis>know</emphasis> what you are
-     doing. Starting multiple servers with the same data directory
-     does <emphasis>not</emphasis> give you extra performance in a
-     threaded system. See <xref linkend="multiple-servers"/>.
+     doing. Starting multiple servers with the same data directory does
+     <emphasis>not</emphasis> give you extra performance in a threaded
+     system. See <xref linkend="multiple-servers"/>.
     </para></listitem>
 
    </itemizedlist>
@@ -1653,18 +1653,18 @@
 
   <para>
    This section discusses the use of the MySQL Instance Manager (IM).
-   This is a daemon running on a TCP/IP port, which provides monitoring 
-   and management of MySQL Database Server instances. MySQL Instance 
+   This is a daemon running on a TCP/IP port, which provides monitoring
+   and management of MySQL Database Server instances. MySQL Instance
    Manager is currently available for unix-like operating systems.
   </para>
 
   <para>
    MySQL Instance Manager is included in MySQL distributions from
-   version 5.0.3, and can be used in place of the 
-   <literal>mysqld_safe</literal> script to start and stop the MySQL 
-   Server, <emphasis role="bold">even from a remote host</emphasis>. 
-   MySQL Instance Manager also implements the functionality (and most of 
-   the syntax) of the <command>mysqld_multi</command> script. A more 
+   version 5.0.3, and can be used in place of the
+   <literal>mysqld_safe</literal> script to start and stop the MySQL
+   Server, <emphasis role="bold">even from a remote host</emphasis>.
+   MySQL Instance Manager also implements the functionality (and most of
+   the syntax) of the <command>mysqld_multi</command> script. A more
    detailed description of MySQL Instance Manager follows.
   </para>
 
@@ -1680,7 +1680,7 @@
     binary) to start MySQL. (In prior versions of MySQL the
     <command>mysqld_safe</command> script is used for this purpose.)
     Starting from MySQL 5.0.4 the behaviour of the init script was
-    changed again to incorporate both setup schemes. In version 5.0.4, 
+    changed again to incorporate both setup schemes. In version 5.0.4,
     the init startup script uses the old scheme (invoking
     <command>mysqld_safe</command>) by default, but one can set the
     <literal>use_mysqld_safe</literal> variable in the script to
@@ -1693,10 +1693,10 @@
       /usr/sbin (tarfile), /usr/local/bin (source), or 
       /usr/local/mysql/libexec (also commonly used)?
 -->
-   
+
    <para>
-    The Instance Manager's behaviour in this case depends on the options 
-    given in the MySQL configuration file. If there is no configuration 
+    The Instance Manager's behaviour in this case depends on the options
+    given in the MySQL configuration file. If there is no configuration
     file, the MySQL Instance Manager creates an instance named
     <literal>mysqld</literal> and attempts to start it with default
     (compiled-in) configuration values. This means that the IM cannot
@@ -1716,11 +1716,11 @@
    </para>
 
    <para>
-    Note that there is a special option <literal>mysqld-path</literal> 
-    (<literal>mysqld-path = &lt;path-to-mysqld-binary&gt;</literal>) 
-    which is recognized only by the IM. Use this variable to let the IM 
-    know where the <command>mysqld</command> binary resides. You should 
-    also set <literal>basedir</literal> and <literal>datadir</literal> 
+    Note that there is a special option <literal>mysqld-path</literal>
+    (<literal>mysqld-path = &lt;path-to-mysqld-binary&gt;</literal>)
+    which is recognized only by the IM. Use this variable to let the IM
+    know where the <command>mysqld</command> binary resides. You should
+    also set <literal>basedir</literal> and <literal>datadir</literal>
     options for the server.
    </para>
 
@@ -1764,7 +1764,7 @@
     using the standard <command>mysql</command> client program, as well
     as the MySQL C API. The IM supports the version of the MySQL
     client-server protocol used by the client tools and libraries
-    distributed along with mysql-4.1 or later.    
+    distributed along with mysql-4.1 or later.
    </para>
 
    <para>
@@ -2001,8 +2001,8 @@
     <para>
      A number of seconds IM should wait for the instance to shut down.
      The default is 35 seconds. After the delay expires, the IM assumes
-     that the instance is hanging and attempts to <literal>kill 
-     -9</literal> it. If you use InnoDB with large tables, you should 
+     that the instance is hanging and attempts to <literal>kill
+     -9</literal> it. If you use InnoDB with large tables, you should
      increase this value.
     </para></listitem>
 
@@ -2363,7 +2363,7 @@
 
    <para>
     <command>mysqld</command> accepts many command-line options. For a
-    brief list, execute <command>mysqld --help</command>. To see the 
+    brief list, execute <command>mysqld --help</command>. To see the
     full list, use <command>mysqld --verbose --help</command>.
    </para>
 
@@ -2394,7 +2394,7 @@
 
     <listitem><para>
      Options specific to particular storage engines: See
-     <xref linkend="myisam-start"/>, <xref linkend="bdb-start"/>, and 
+     <xref linkend="myisam-start"/>, <xref linkend="bdb-start"/>, and
      <xref linkend="innodb-start"/>.
     </para></listitem>
 
@@ -2412,7 +2412,7 @@
     </para>
 
     <para>
-     Display a short help message and exit. Use both the 
+     Display a short help message and exit. Use both the
      <literal>--verbose</literal> and <literal>--help</literal> options
      to see the full message.
     </para></listitem>
@@ -2427,8 +2427,8 @@
      loaded. By default, the option is off and only UDFs that have at
      least one auxiliary symbol can be loaded. This prevents attempts at
      loading functions from shared object files other than those
-     containing legitimate UDFs. In the MySQL 5.0 series of releases, 
-     this option was added in version 5.0.3. See 
+     containing legitimate UDFs. In the MySQL 5.0 series of releases,
+     this option was added in version 5.0.3. See
      <xref linkend="udf-security"/>.
     </para></listitem>
 
@@ -2452,11 +2452,12 @@
      The path to the MySQL installation directory. All paths are usually
      resolved relative to this.
     </para></listitem>
-  
-  <!--  
+
+<!--  
         TODO: Cut this? If not, remove space in "- -big-tables" which 
         was added to prevent XML parse error. 
   -->
+
 <!--
     <listitem><para>
      <literal>- -big-tables</literal>
@@ -2471,7 +2472,7 @@
      switching to disk tables where necessary.
     </para></listitem>
 -->
-  
+
     <listitem><para>
      <literal>--bind-address=<replaceable>IP</replaceable></literal>
     </para>
@@ -2485,10 +2486,10 @@
     </para>
 
     <para>
-      Write error log messages to <literal>stderr</literal> and 
-      <literal>stdout</literal> even if <literal>--log-error</literal> 
-      is specified. On Windows, <command>mysqld</command> does not close 
-      the console screen if this option is used.
+     Write error log messages to <literal>stderr</literal> and
+     <literal>stdout</literal> even if <literal>--log-error</literal> is
+     specified. On Windows, <command>mysqld</command> does not close the
+     console screen if this option is used.
     </para></listitem>
 
     <listitem><para>
@@ -2507,8 +2508,8 @@
     <para>
      Put the <command>mysqld</command> server in a closed environment
      during startup by using the <literal>chroot()</literal> system
-     call. This is a recommended security measure. Note that use of this 
-     option somewhat limits <literal>LOAD DATA INFILE</literal> and 
+     call. This is a recommended security measure. Note that use of this
+     option somewhat limits <literal>LOAD DATA INFILE</literal> and
      <literal>SELECT ... INTO OUTFILE</literal>.
     </para></listitem>
 
@@ -2567,7 +2568,8 @@
     </para></listitem>
 
     <listitem><para>
-     (<emphasis>DEPRECATED</emphasis>) <literal>--default-character-set=<replaceable>charset</replaceable></literal>
+     (<emphasis>DEPRECATED</emphasis>)
+     <literal>--default-character-set=<replaceable>charset</replaceable></literal>
     </para>
 
     <para>
@@ -2584,7 +2586,7 @@
     <para>
      Use <replaceable>collation</replaceable> as the default collation.
      This option is deprecated in favor of
-     <literal>--collation-server</literal>. See 
+     <literal>--collation-server</literal>. See
      <xref linkend="character-sets"/>.
     </para></listitem>
 
@@ -2630,7 +2632,7 @@
      key writes for those tables that were created with the
      <literal>DELAYED KEYS</literal> option. <literal>ALL</literal>
      delays key writes for all <literal>MyISAM</literal> tables. See
-     <xref linkend="server-parameters"/>. See 
+     <xref linkend="server-parameters"/>. See
      <xref linkend="myisam-start"/>.
     </para>
 
@@ -2828,22 +2830,22 @@
      as the filename.
     </para></listitem>
 
-  <listitem><para>
-   <option>--log-bin-trust-routine-creators[={0|1}]</option>
-  </para>
+    <listitem><para>
+     <option>--log-bin-trust-routine-creators[={0|1}]</option>
+    </para>
 
-  <para>
-   With no argument or an argument of 1, this option sets the
-   <literal>log_bin_trust_routine_creators</literal> system variable to
-   1. With an argument of 0, this option sets the system variable to 0.
-   <literal>log_bin_trust_routine_creators</literal> affects how MySQL
-   enforces restrictions on stored routine creation. See
-   <xref linkend="stored-procedure-logging"/>.
-  </para>
+    <para>
+     With no argument or an argument of 1, this option sets the
+     <literal>log_bin_trust_routine_creators</literal> system variable
+     to 1. With an argument of 0, this option sets the system variable
+     to 0. <literal>log_bin_trust_routine_creators</literal> affects how
+     MySQL enforces restrictions on stored routine creation. See
+     <xref linkend="stored-procedure-logging"/>.
+    </para>
 
-  <para>
-   This option was added in MySQL 5.0.6.
-  </para></listitem>
+    <para>
+     This option was added in MySQL 5.0.6.
+    </para></listitem>
 
     <listitem><para>
      <literal>--log-error[=<replaceable>file</replaceable>]</literal>
@@ -2868,15 +2870,16 @@
     </para></listitem>
 
     <listitem><para>
-        (<emphasis>DEPRECATED</emphasis>) <literal>--log-long-format</literal>
+     (<emphasis>DEPRECATED</emphasis>)
+     <literal>--log-long-format</literal>
     </para>
 
     <para>
-     Log extra information to whichever of the update log, binary update 
-     log, and slow queries log that have been activated. For example, 
-     username and timestamp are logged for all queries. This option is 
-     deprecated in MySQL 5.0, as it now represents the default logging 
-     behaviour. (See the description for 
+     Log extra information to whichever of the update log, binary update
+     log, and slow queries log that have been activated. For example,
+     username and timestamp are logged for all queries. This option is
+     deprecated in MySQL 5.0, as it now represents the default logging
+     behaviour. (See the description for
      <literal>--log-short-format</literal>.) The
      <literal>--log-queries-not-using-indexes</literal> option is
      available for the purpose of logging queries that do not use
@@ -2890,7 +2893,7 @@
     <para>
      If you are using this option with
      <literal>--log-slow-queries</literal>, then queries that are not
-     using indexes also are logged to the slow query log. See 
+     using indexes also are logged to the slow query log. See
      <xref linkend="slow-query-log"/>.
     </para></listitem>
 
@@ -2899,9 +2902,9 @@
     </para>
 
     <para>
-      Log less information to whichever of the update log, binary update 
-      log, and slow queries log that have been activated. For example, 
-      the username and timestamp are not logged for queries.
+     Log less information to whichever of the update log, binary update
+     log, and slow queries log that have been activated. For example,
+     the username and timestamp are not logged for queries.
     </para></listitem>
 
     <listitem><para>
@@ -2912,8 +2915,7 @@
      Log slow administrative statements such as <literal>OPTIMIZE
      TABLE</literal>, <literal>ANALYZE TABLE</literal>, and
      <literal>ALTER TABLE</literal> to the slow query log.
-    </para>
-    </listitem>
+    </para></listitem>
 
     <listitem><para>
      <literal>--log-slow-queries[=<replaceable>file</replaceable>]</literal>
@@ -2936,12 +2938,11 @@
      to the error log. Enabling this option is recommended, for example,
      if you use replication (you get more information about what is
      happening, such as messages about network failures and
-     reconnections). This option is enabled by default in MySQL 5.0; to 
-     disable it, use <literal>--skip-log-warnings</literal>. Aborted 
-     connections are not logged to the error log unless the value is 
+     reconnections). This option is enabled by default in MySQL 5.0; to
+     disable it, use <literal>--skip-log-warnings</literal>. Aborted
+     connections are not logged to the error log unless the value is
      greater than 1. See <xref linkend="communication-errors"/>.
-    </para>
-    </listitem>
+    </para></listitem>
 
     <listitem><para>
      <literal>--low-priority-updates</literal>
@@ -3059,8 +3060,7 @@
      <literal>BACKUP,FORCE</literal>. This forces a repair of a table
      even if some rows would be deleted, but it keeps the old data file
      as a backup so that you can later examine what happened.
-    </para>
-    </listitem>
+    </para></listitem>
 
     <listitem><para>
      <literal>--ndb-connectstring=<replaceable>connect_string</replaceable></literal>
@@ -3079,8 +3079,8 @@
 
     <para>
      If the binary includes support for the <literal>NDB
-     Cluster</literal> storage engine, the default disabling of support 
-     for MySQL Cluster can be overruled by using this option. See 
+     Cluster</literal> storage engine, the default disabling of support
+     for MySQL Cluster can be overruled by using this option. See
      <xref linkend="ndbcluster"/>.
     </para></listitem>
 
@@ -3091,7 +3091,7 @@
     <para>
      Force the server to generate short (pre-4.1) password hashes for
      new passwords. This is useful for compatibility when the server
-     must support older client programs. See 
+     must support older client programs. See
      <xref linkend="password-hashing"/>.
     </para></listitem>
 
@@ -3164,11 +3164,12 @@
     </para></listitem>
 
     <listitem><para>
-     (<emphasis>DEPRECATED</emphasis>) <literal>--safe-show-database</literal>
+     (<emphasis>DEPRECATED</emphasis>)
+     <literal>--safe-show-database</literal>
     </para>
 
     <para>
-      See <xref linkend="privileges-provided"/>.
+     See <xref linkend="privileges-provided"/>.
     </para></listitem>
 
     <listitem><para>
@@ -3234,10 +3235,10 @@
     </para>
 
     <para>
-     Don't use system locking. To use <command>myisamchk</command>, you 
-     must shut down the server. (See <xref linkend="stability"/>.) To 
-     avoid this requirement, use <literal>CHECK TABLE</literal> and 
-     <literal>REPAIR TABLE</literal> from the MySQL Monitor to check and 
+     Don't use system locking. To use <command>myisamchk</command>, you
+     must shut down the server. (See <xref linkend="stability"/>.) To
+     avoid this requirement, use <literal>CHECK TABLE</literal> and
+     <literal>REPAIR TABLE</literal> from the MySQL Monitor to check and
      repair <literal>MyISAM</literal> tables.
     </para></listitem>
 
@@ -3247,12 +3248,12 @@
 
     <para>
      This option causes the server not to use the privilege system at
-     all. This gives anyone with access to the server 
-     <emphasis>unrestricted access</emphasis> to <emphasis>all 
-     databases</emphasis>. You can cause a running server to start using 
+     all. This gives anyone with access to the server
+     <emphasis>unrestricted access</emphasis> to <emphasis>all
+     databases</emphasis>. You can cause a running server to start using
      the grant tables again by executing <command>mysqladmin
      flush-privileges</command> or <command>mysqladmin reload</command>
-     command from a system shell, or by issuing a MySQL <literal>FLUSH 
+     command from a system shell, or by issuing a MySQL <literal>FLUSH
      PRIVILEGES</literal> statement.
     </para></listitem>
 
@@ -3295,8 +3296,8 @@
      Disable the <literal>NDB Cluster</literal> storage engine. This is
      the default for binaries that were built with <literal>NDB
      Cluster</literal> storage engine support, this means that the
-     system allocates memory and other resources for this storage engine 
-     only if <literal>--skip-ndbcluster</literal> is explicitly 
+     system allocates memory and other resources for this storage engine
+     only if <literal>--skip-ndbcluster</literal> is explicitly
      overridden using the <literal>--ndbcluster</literal> option. See
      <xref linkend="mysql-cluster-quick"/> for an example of usage.
     </para></listitem>
@@ -3318,7 +3319,7 @@
     </para>
 
     <para>
-     Windows-NT based systems only; instructs the MySQL server not to 
+     Windows-NT based systems only; instructs the MySQL server not to
      run as a service.
     </para></listitem>
 
@@ -3352,8 +3353,7 @@
       </para></listitem>
 
      </itemizedlist>
-    </para>
-    </listitem>
+    </para></listitem>
 
     <listitem><para>
      <literal>--skip-safemalloc</literal>
@@ -3403,6 +3403,7 @@
     <listitem><para>
      <literal>--socket=<replaceable>path</replaceable></literal>
     </para>
+
 <!--  
       Put the Unix description first, because the option name relates directly 
       to the Unix meaning. Putting the Windows meaning first makes this more
@@ -3415,8 +3416,8 @@
      <filename>/tmp/mysql.sock</filename>. On Windows, the option
      specifies the pipe name to use for local connections that use a
      named pipe. The default value is <literal>MySQL</literal>.
-    </para>
-  </listitem>
+    </para></listitem>
+
 <!--  
       TODO: some of these option values currently are unimplemented. 
       Need to say which ones. 
@@ -3466,11 +3467,11 @@
      The path of the directory to use for creating temporary files. It
      might be useful if your default <literal>/tmp</literal> directory
      resides on a partition that is too small to hold temporary tables.
-     In MySQL 5.0, this option accepts several paths that are used in 
-     round-robin fashion. Paths should be separated by colon characters 
-     ('<literal>:</literal>') on Unix and semicolon characters 
-     ('<literal>;</literal>') on Windows, NetWare, and OS/2. If the 
-     MySQL server is acting as a replication slave, you should not set 
+     In MySQL 5.0, this option accepts several paths that are used in
+     round-robin fashion. Paths should be separated by colon characters
+     ('<literal>:</literal>') on Unix and semicolon characters
+     ('<literal>;</literal>') on Windows, NetWare, and OS/2. If the
+     MySQL server is acting as a replication slave, you should not set
      <literal>--tmpdir</literal> to point to a directory on a
      memory-based filesystem or to a directory that is cleared when the
      server host restarts. A replication slave needs some of its
@@ -3504,12 +3505,12 @@
     </para>
 
     <para>
-     To avoid a possible security hole where a user adds a 
-     <literal>--user=root</literal> option to a 
-     <filename>my.cnf</filename> file (thus causing the server to run as 
-     <literal>root</literal>), <command>mysqld</command> uses only the 
-     first <literal>--user</literal> option specified and produces a 
-     warning if there are multiple <literal>--user</literal> options. 
+     To avoid a possible security hole where a user adds a
+     <literal>--user=root</literal> option to a
+     <filename>my.cnf</filename> file (thus causing the server to run as
+     <literal>root</literal>), <command>mysqld</command> uses only the
+     first <literal>--user</literal> option specified and produces a
+     warning if there are multiple <literal>--user</literal> options.
      Options in <filename>/etc/my.cnf</filename> and
      <filename>$MYSQL_HOME/my.cnf</filename> are processed before
      command-line options, so it is recommended that you put a
@@ -3534,8 +3535,8 @@
    </itemizedlist>
 
    <para>
-    In MySQL 5.0, you can assign a value to a server system variable
-    by using an option of the form
+    In MySQL 5.0, you can assign a value to a server system variable by
+    using an option of the form
     <literal>--<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>.
     For example, <literal>--key_buffer_size=32M</literal> sets the
     <literal>key_buffer_size</literal> variable to a value of 32MB.
@@ -3549,7 +3550,7 @@
    </para>
 
 <!-- TODO: Determine if this is still supported at all in MySQL 5.0. -->
-   
+
    <para>
     It is also possible to set variables by using
     <literal>--set-variable=<replaceable>var_name</replaceable>=<replaceable>value</replaceable></literal>
@@ -3585,9 +3586,9 @@
    <title id='title-server-sql-mode'>&title-server-sql-mode;</title>
 
    <para>
-    The MySQL server can operate in different SQL modes, and can apply 
-    these modes differently for different clients. This allows each 
-    application to tailor the server's operating mode to its own 
+    The MySQL server can operate in different SQL modes, and can apply
+    these modes differently for different clients. This allows each
+    application to tailor the server's operating mode to its own
     requirements.
    </para>
 
@@ -3607,14 +3608,15 @@
    </para>
 
    <para>
-    In MySQL 5.0, you can also change the SQL mode after startup time by 
-    setting the <literal>sql_mode</literal> variable using a 
-    <literal>SET [SESSION|GLOBAL] sql_mode='<replaceable>modes</replaceable>'</literal> 
-    statement. Setting the <literal>GLOBAL</literal> variable requires 
-    the <literal>SUPER</literal> privilege and affects the operation of 
-    all clients that connect from that time on. Setting the 
+    In MySQL 5.0, you can also change the SQL mode after startup time by
+    setting the <literal>sql_mode</literal> variable using a
+    <literal>SET [SESSION|GLOBAL]
+    sql_mode='<replaceable>modes</replaceable>'</literal> statement.
+    Setting the <literal>GLOBAL</literal> variable requires the
+    <literal>SUPER</literal> privilege and affects the operation of all
+    clients that connect from that time on. Setting the
     <literal>SESSION</literal> variable affects only the current client.
-    Any client can change its own session <literal>sql_mode</literal> 
+    Any client can change its own session <literal>sql_mode</literal>
     value at any time.
    </para>
 
@@ -3724,13 +3726,13 @@
     </para>
 
     <para>
-     This mode is implemented in MySQL 5.0.2. Before 5.0.2, this was the 
-     default MySQL date-handling mode. As of 5.0.2, enabling strict mode 
-     causes the server to require that month and day values be legal, 
-     and not merely in the range 1 to 12 and 1 to 31, respectively. For 
-     example, <literal>'2004-04-31'</literal> is legal with strict mode 
-     disabled, but illegal with strict mode enabled. To allow such dates 
-     in strict mode, enable <literal>ALLOW_INVALID_DATES</literal> as 
+     This mode is implemented in MySQL 5.0.2. Before 5.0.2, this was the
+     default MySQL date-handling mode. As of 5.0.2, enabling strict mode
+     causes the server to require that month and day values be legal,
+     and not merely in the range 1 to 12 and 1 to 31, respectively. For
+     example, <literal>'2004-04-31'</literal> is legal with strict mode
+     disabled, but illegal with strict mode enabled. To allow such dates
+     in strict mode, enable <literal>ALLOW_INVALID_DATES</literal> as
      well.
     </para>
 
@@ -3773,7 +3775,7 @@
      <literal>NULL</literal> for divisions by zero. If used in
      <literal>INSERT IGNORE</literal> or <literal>UPDATE
      IGNORE</literal>, MySQL generates a warning for divisions by zero,
-     but the result of the operation is <literal>NULL</literal>. 
+     but the result of the operation is <literal>NULL</literal>.
      (Implmented in MySQL 5.0.2)
     </para>
 
@@ -3881,8 +3883,8 @@
      <literal>0</literal> values, resulting in a table with different
      contents than the one that was dumped. Enabling
      <literal>NO_AUTO_VALUE_ON_ZERO</literal> before reloading the dump
-     file solves this problem. In MySQL 5.0, 
-     <command>mysqldump</command> automatically includes in its output a 
+     file solves this problem. In MySQL 5.0,
+     <command>mysqldump</command> automatically includes in its output a
      statement enabling <literal>NO_AUTO_VALUE_ON_ZERO</literal>.
     </para>
 
@@ -3899,7 +3901,7 @@
     <para>
      Disable the use of the backslash character ('<literal>\</literal>')
      as an escape character within strings. With this mode enabled,
-     backslash becomes any ordinary character like any other. 
+     backslash becomes any ordinary character like any other.
      (Implemented in MySQL 5.0.1)
     </para>
 
@@ -3917,8 +3919,7 @@
      When creating a table, ignore all <literal>INDEX
      DIRECTORY</literal> and <literal>DATA DIRECTORY</literal>
      directives. This option is useful on slave replication servers.
-    </para>
-    </listitem>
+    </para></listitem>
 
     <listitem><para>
      <literal>NO_ENGINE_SUBSTITUTION</literal>
@@ -4026,7 +4027,7 @@
      In strict mode, don't accept dates where the month or day part is
      0. If used with the <literal>IGNORE</literal> option, we insert a
      <literal>'0000-00-00'</literal> date for any such date. When not in
-     strict mode, the date is accepted but a warning is generated. 
+     strict mode, the date is accepted but a warning is generated.
      (Added in MySQL 5.0.2)
     </para>
 
@@ -4182,8 +4183,8 @@
    <para>
     The following special modes are provided as shorthand for
     combinations of mode values from the preceding list. All are
-    available in MySQL 5.0 beginning with version 5.0.0, except for 
-    <literal>TRADITIONAL</literal>, which was implemented in MySQL 
+    available in MySQL 5.0 beginning with version 5.0.0, except for
+    <literal>TRADITIONAL</literal>, which was implemented in MySQL
     5.0.2.
    </para>
 
@@ -4207,7 +4208,7 @@
     <para>
      Equivalent to <literal>REAL_AS_FLOAT</literal>,
      <literal>PIPES_AS_CONCAT</literal>, <literal>ANSI_QUOTES</literal>,
-     <literal>IGNORE_SPACE</literal>. Before MySQL 5.0.3, 
+     <literal>IGNORE_SPACE</literal>. Before MySQL 5.0.3,
      <literal>ANSI</literal> also includes
      <literal>ONLY_FULL_GROUP_BY</literal>. See
      <xref linkend="ansi-mode"/>.
@@ -4398,9 +4399,9 @@
 <!--  If you make changes one place, change them both. -->
 
    <para>
-    The <command>mysqld</command> server maintains two kinds of 
-    variables. Global variables affect the overall operation of the 
-    server. Session variables affect its operation for individual client 
+    The <command>mysqld</command> server maintains two kinds of
+    variables. Global variables affect the overall operation of the
+    server. Session variables affect its operation for individual client
     connections.
    </para>
 
@@ -4734,13 +4735,16 @@
     <primary>variables</primary>
     <secondary>values</secondary>
    </indexterm>
+
 <!--  TODO: Make the following reference to RefMan-4.1 a link.  -->
+
    <para>
     Most system variables are described here. Variables with no version
-    indicated are present in all MySQL 5.0 releases. For historical 
-    information concerning their implementation, please see 
-    <citetitle>&title-refman-previous;</citetitle>. <literal>InnoDB</literal> 
-    system variables are listed in <xref linkend="innodb-start"/>.
+    indicated are present in all MySQL 5.0 releases. For historical
+    information concerning their implementation, please see
+    <citetitle>&title-refman-previous;</citetitle>.
+    <literal>InnoDB</literal> system variables are listed in
+    <xref linkend="innodb-start"/>.
    </para>
 
    <para>
@@ -5097,8 +5101,7 @@
 bdb: Lock table is out of available locks
 Got error 12 from ...
 </programlisting>
-    </para>
-    </listitem>
+    </para></listitem>
 
     <listitem><para>
      <literal>bdb_shared_data</literal>
@@ -5138,7 +5141,8 @@
      big, multiple-statement transactions, you can increase this to get
      more performance. The <literal>Binlog_cache_use</literal> and
      <literal>Binlog_cache_disk_use</literal> status variables can be
-     useful for tuning the size of this variable. See <xref linkend="binary-log"/>.
+     useful for tuning the size of this variable. See
+     <xref linkend="binary-log"/>.
     </para></listitem>
 
     <listitem><para>
@@ -5167,7 +5171,9 @@
     <listitem><para>
      <literal>character_set_connection</literal>
     </para>
+
 <!--  TODO: Wording: "introducer"?  -->
+
     <para>
      The character set used for literals that do not have a character
      set introducer and for number-to-string conversion.
@@ -5331,10 +5337,10 @@
     <para>
      The MySQL data directory. This variable can be set with the
      <literal>--datadir</literal> option.
-   </para>
-    </listitem>
-    
+    </para></listitem>
+
 <!--  TODO: Document date_format and datetime_format.  -->
+
 <!--
       <listitem>
        <para><literal>date_format</literal></para>
@@ -5350,6 +5356,7 @@
 -->
 
 <!--  TODO: Document div_precision_increment.  -->
+
 <!--
     <listitem>
       <para><literal>div_precision_increment</literal></para>
@@ -5357,6 +5364,7 @@
       <para></para>
       </listitem>
 -->
+
     <listitem><para>
      <literal>default_week_format</literal>
     </para>
@@ -5438,8 +5446,7 @@
      Note that <literal>--external-locking</literal> doesn't offer any
      protection against index corruption for tables that use delayed key
      writes.
-    </para>
-    </listitem>
+    </para></listitem>
 
     <listitem><para>
      <literal>delayed_insert_limit</literal>
@@ -5501,7 +5508,7 @@
     <para>
      If this is set to a non-zero value, all tables are closed every
      <literal>flush_time</literal> seconds to free up resources and sync
-     unflushed data to disk. We recommend that this option be used only 
+     unflushed data to disk. We recommend that this option be used only
      on Windows 9x or Me, or on systems with minimal resources.
     </para></listitem>
 
@@ -5511,14 +5518,14 @@
 
     <para>
      The list of operators supported by boolean full-text searches
-     performed using <literal>IN BOOLEAN MODE</literal>. See 
+     performed using <literal>IN BOOLEAN MODE</literal>. See
      <xref linkend="fulltext-boolean"/>.
     </para>
 
     <para>
-     The default variable value is 
-     <literal>'+ -&gt;&lt;()~*:&quot;&quot;&amp;|'</literal>. 
-     The rules for changing the value are as follows:
+     The default variable value is <literal>'+
+     -&gt;&lt;()~*:&quot;&quot;&amp;|'</literal>. The rules for changing
+     the value are as follows:
     </para>
 
     <para>
@@ -5561,7 +5568,7 @@
 
     <para>
      The maximum length of the word to be included in a
-     <literal>FULLTEXT</literal> index. 
+     <literal>FULLTEXT</literal> index.
     </para>
 
     <para>
@@ -5593,7 +5600,7 @@
 
     <para>
      The number of top matches to use for full-text searches performed
-     using <literal>WITH QUERY EXPANSION</literal>. 
+     using <literal>WITH QUERY EXPANSION</literal>.
     </para></listitem>
 
     <listitem><para>
@@ -5684,13 +5691,13 @@
     </para>
 
     <para>
-      <literal>have_federated_engine</literal>
+     <literal>have_federated_engine</literal>
     </para>
 
     <para>
-      <literal>YES</literal> if <command>mysqld</command> supports 
-      <literal>FEDERATED</literal> tables, <literal>NO</literal> if not. 
-      This variable was added in MySQL 5.0.3.
+     <literal>YES</literal> if <command>mysqld</command> supports
+     <literal>FEDERATED</literal> tables, <literal>NO</literal> if not.
+     This variable was added in MySQL 5.0.3.
     </para></listitem>
 
     <listitem><para>
@@ -5716,8 +5723,8 @@
     </para>
 
     <para>
-     In MySQL 5.0, this appears only for reasons of backwards 
-     compatibility, and is always <literal>NO</literal>, as 
+     In MySQL 5.0, this appears only for reasons of backwards
+     compatibility, and is always <literal>NO</literal>, as
      <literal>ISAM</literal> tables are no longer supported.
     </para></listitem>
 
@@ -5965,8 +5972,8 @@
      The fraction of the key buffer in use can be determined using
      <literal>key_buffer_size</literal> in conjunction with the
      <literal>Key_blocks_unused</literal> status variable and the buffer
-     block size. The buffer block size is available from the 
-     <literal>key_cache_block_size</literal> server variable. The 
+     block size. The buffer block size is available from the
+     <literal>key_cache_block_size</literal> server variable. The
      fraction of the buffer in use is:
     </para>
 
@@ -5982,8 +5989,8 @@
     </para>
 
     <para>
-     In MySQL 5.0, it is possible to create multiple MyISAM key caches. 
-     The size limit of 4GB applies to each cache individually, not as a 
+     In MySQL 5.0, it is possible to create multiple MyISAM key caches.
+     The size limit of 4GB applies to each cache individually, not as a
      group. See <xref linkend="myisam-key-cache"/>.
     </para></listitem>
 
@@ -6015,7 +6022,7 @@
      The division point between the hot and warm sub-chains of the key
      cache buffer chain. The value is the percentage of the buffer chain
      to use for the warm sub-chain. Allowable values range from 1 to
-     100. The default value is 100. See 
+     100. The default value is 100. See
      <xref linkend="myisam-key-cache"/>.
     </para></listitem>
 
@@ -6085,39 +6092,39 @@
     </para>
 
     <para>
-     Whether the binary log is enabled. See 
+     Whether the binary log is enabled. See
      <xref linkend="binary-log"/>.
     </para></listitem>
 
-  <listitem><para>
-   log_bin_trust_routine_creators
-  </para>
+    <listitem><para>
+     log_bin_trust_routine_creators
+    </para>
 
-  <para>
-   This variable applies when binary logging is enabled. It controls
-   whether stored routine creators can be trusted not to create stored
-   routines that will cause unsafe events to be written to the binary
-   log. If set to 0 (the default), users are not allowed to create or
-   alter stored routines unless they have the <literal>SUPER</literal>
-   privilege in addition to the <literal>CREATE ROUTINE</literal> or
-   <literal>ALTER ROUTINE</literal> privilege.
-  </para>
+    <para>
+     This variable applies when binary logging is enabled. It controls
+     whether stored routine creators can be trusted not to create stored
+     routines that will cause unsafe events to be written to the binary
+     log. If set to 0 (the default), users are not allowed to create or
+     alter stored routines unless they have the <literal>SUPER</literal>
+     privilege in addition to the <literal>CREATE ROUTINE</literal> or
+     <literal>ALTER ROUTINE</literal> privilege.
+    </para>
 
-  <para>
-   A setting of 0 also enforces the restriction that a routine must be
-   declared with the <literal>DETERMINISTIC</literal> characteristic, or
-   with the <literal>READS SQL DATA</literal> or <literal>NO
-   SQL</literal> characteristic. If the variable is set to 1, MySQL does
-   not enforce these restrictions on stored routine creation.
-  </para>
+    <para>
+     A setting of 0 also enforces the restriction that a routine must be
+     declared with the <literal>DETERMINISTIC</literal> characteristic,
+     or with the <literal>READS SQL DATA</literal> or <literal>NO
+     SQL</literal> characteristic. If the variable is set to 1, MySQL
+     does not enforce these restrictions on stored routine creation.
+    </para>
 
-  <para>
-   See <xref linkend="stored-procedure-logging"/>.
-  </para>
+    <para>
+     See <xref linkend="stored-procedure-logging"/>.
+    </para>
 
-  <para>
-   This variable was added in MySQL 5.0.6.
-  </para></listitem>
+    <para>
+     This variable was added in MySQL 5.0.6.
+    </para></listitem>
 
     <listitem><para>
      <literal>log_error</literal>
@@ -6153,8 +6160,8 @@
     </para>
 
     <para>
-     Whether to produce additional warning messages. It is enabled by 
-     default. Aborted connections are not logged to the error log unless 
+     Whether to produce additional warning messages. It is enabled by
+     default. Aborted connections are not logged to the error log unless
      the value is greater than 1.
     </para></listitem>
 
@@ -6202,9 +6209,9 @@
 
     <para>
      If set to 1, table names are stored in lowercase on disk and table
-     name comparisons are not case sensitive. If set to 2 table names 
-     are stored as given but compared in lowercase. This option also 
-     applies to database names and table aliases. See 
+     name comparisons are not case sensitive. If set to 2 table names
+     are stored as given but compared in lowercase. This option also
+     applies to database names and table aliases. See
      <xref linkend="name-case-sensitivity"/>.
     </para>
 
@@ -6217,9 +6224,9 @@
     <para>
      You should <emphasis>not</emphasis> set this variable to 0 if you
      are running MySQL on a system that does not have case-sensitive
-     filenames (such as Windows or Mac OS X). If this variable is not 
-     set at startup and the filesystem on which the data directory is 
-     located does not have case-sensitive filenames, MySQL automatically 
+     filenames (such as Windows or Mac OS X). If this variable is not
+     set at startup and the filesystem on which the data directory is
+     located does not have case-sensitive filenames, MySQL automatically
      sets <literal>lower_case_table_names</literal> to 2.
     </para></listitem>
 
@@ -6242,8 +6249,8 @@
     <para>
      You must increase this value if you are using big
      <literal>BLOB</literal> columns or long strings. It should be as
-     big as the biggest <literal>BLOB</literal> you want to use. In 
-     MySQL 5.0, the protocol limit for 
+     big as the biggest <literal>BLOB</literal> you want to use. In
+     MySQL 5.0, the protocol limit for
      <literal>max_allowed_packet</literal> is 1GB.
     </para></listitem>
 
@@ -6325,7 +6332,7 @@
     <para>
      The maximum number of error, warning, and note messages to be
      stored for display by <literal>SHOW ERRORS</literal> or
-     <literal>SHOW WARNINGS</literal>. 
+     <literal>SHOW WARNINGS</literal>.
     </para></listitem>
 
     <listitem><para>
@@ -6373,7 +6380,7 @@
     <para>
      Setting this variable to a value other than
      <literal>DEFAULT</literal> resets the value of
-     <literal>SQL_BIG_SELECTS</literal> to <literal>0</literal>. If you 
+     <literal>SQL_BIG_SELECTS</literal> to <literal>0</literal>. If you
      set the <literal>SQL_BIG_SELECTS</literal> value again, the
      <literal>max_join_size</literal> variable is ignored.
     </para>
@@ -6426,8 +6433,7 @@
      of the key (see <xref linkend="show-index"/>). By setting this to a
      low value (100?), you can force MySQL to prefer keys instead of
      table scans.
-    </para>
-    </listitem>
+    </para></listitem>
 
     <listitem><para>
      <literal>max_sort_length</literal>
@@ -6460,9 +6466,9 @@
 
     <para>
      Before MySQL 5.0.3, this variable has only global scope. Beginning
-     with MySQL 5.0.3, it also has a read-only session scope. The session
-     variable has the same value as the global variable unless the
-     current account has a non-zero
+     with MySQL 5.0.3, it also has a read-only session scope. The
+     session variable has the same value as the global variable unless
+     the current account has a non-zero
      <literal>MAX_USER_CONNECTIONS</literal> resource limit. In that
      case, the session value reflects the account limit.
     </para></listitem>
@@ -6499,23 +6505,27 @@
      The default pointer size in bytes, to be used by <literal>CREATE
      TABLE</literal> for <literal>MyISAM</literal> tables when no
      <literal>MAX_ROWS</literal> option is specified. This variable
-     cannot be less than 2 or larger than 7. The default value is 4.
-     See <xref linkend="full-table"/>.
+     cannot be less than 2 or larger than 7. The default value is 4. See
+     <xref linkend="full-table"/>.
     </para></listitem>
 
     <listitem><para>
-        (<emphasis>DEPRECATED</emphasis>) <literal>myisam_max_extra_sort_file_size</literal>
+     (<emphasis>DEPRECATED</emphasis>)
+     <literal>myisam_max_extra_sort_file_size</literal>
     </para>
 
-    <para>If the temporary file used for fast <literal>MyISAM</literal> index
+    <para>
+     If the temporary file used for fast <literal>MyISAM</literal> index
      creation would be larger than using the key cache by the amount
      specified here, prefer the key cache method. This is mainly used to
      force long character keys in large tables to use the slower key
-     cache method to create the index. The value is given in bytes.</para> 
-     
-      <para><emphasis role="bold">Note</emphasis>: This variable was 
-        removed in MySQL 5.0.6.</para>
-    </listitem>
+     cache method to create the index. The value is given in bytes.
+    </para>
+
+    <para>
+     <emphasis role="bold">Note</emphasis>: This variable was removed in
+     MySQL 5.0.6.
+    </para></listitem>
 
     <listitem><para>
      <literal>myisam_max_sort_file_size</literal>
@@ -6567,7 +6577,7 @@
     </para>
 
     <para>
-     (Windows only.) Indicates whether the server supports connections 
+     (Windows only.) Indicates whether the server supports connections
      over named pipes.
     </para></listitem>
 
@@ -6623,8 +6633,8 @@
     </para>
 
     <para>
-     This variable was used in MySQL 4.0 to turn on some 4.1 behaviors, 
-     and is retained for backwards compatibility. In MySQL 5.0, its 
+     This variable was used in MySQL 4.0 to turn on some 4.1 behaviors,
+     and is retained for backwards compatibility. In MySQL 5.0, its
      value is always <literal>OFF</literal>.
     </para></listitem>
 
@@ -6674,8 +6684,8 @@
      return an execution plan quicker, but the resulting plan may be far
      from being optimal. If set to 0, the system automatically picks a
      reasonable value. If set to the maximum number of tables used in a
-     query plus 2, the optimizer switches to the algorithm used in MySQL 
-     5.0.0 (and previous versions) for performing searches. This 
+     query plus 2, the optimizer switches to the algorithm used in MySQL
+     5.0.0 (and previous versions) for performing searches. This
      variable was added in MySQL 5.0.1.
     </para></listitem>
 
@@ -6716,7 +6726,9 @@
     <listitem><para>
      <literal>query_alloc_block_size</literal>
     </para>
+
 <!--  TODO: How much is "a bit"?  -->
+
     <para>
      The allocation size of memory blocks that are allocated for objects
      created during query parsing and execution. If you have problems
@@ -6728,7 +6740,7 @@
     </para>
 
     <para>
-     Don't cache results that are larger than this number of bytes. The 
+     Don't cache results that are larger than this number of bytes. The
      default value is 1048576 (1MB).
     </para></listitem>
 
@@ -6737,9 +6749,9 @@
     </para>
 
     <para>
-     The minimum size (in bytes) for blocks allocated by the query 
-     cache. The default value is 4096 (4KB). Tuning information for this 
-     variable is given in <xref linkend="query-cache-configuration"/>. 
+     The minimum size (in bytes) for blocks allocated by the query
+     cache. The default value is 4096 (4KB). Tuning information for this
+     variable is given in <xref linkend="query-cache-configuration"/>.
     </para></listitem>
 
     <listitem><para>
@@ -6750,7 +6762,7 @@
      The amount of memory allocated for caching query results. The
      default value is 0, which disables the query cache. Note that this
      amount of memory is allocated even if
-     <literal>query_cache_type</literal> is set to 0. See 
+     <literal>query_cache_type</literal> is set to 0. See
      <xref linkend="query-cache-configuration"/> for more information.
     </para></listitem>
 
@@ -6762,7 +6774,7 @@
      Set query cache type. Setting the <literal>GLOBAL</literal> value
      sets the type for all clients that connect thereafter. Individual
      clients can set the <literal>SESSION</literal> value to affect
-     their own use of the query cache. Possible values are shown in the 
+     their own use of the query cache. Possible values are shown in the
      following table:
     </para>
 
@@ -6810,10 +6822,10 @@
         </tbody>
       </tgroup>
     </informaltable>
-    
-    <para>In MySQL 5.0, this variable defaults to 
-      <literal>ON</literal>.</para>
-    </listitem>
+
+    <para>
+     In MySQL 5.0, this variable defaults to <literal>ON</literal>.
+    </para></listitem>
 
     <listitem><para>
      <literal>query_cache_wlock_invalidate</literal>
@@ -6848,8 +6860,7 @@
       It won't necessarily eliminate allocation completely; server *may* still
       allocate memory in some situations, e.g., transaction-related or sp-related
       ops. 
--->
-    </listitem>
+--></listitem>
 
     <listitem><para>
      <literal>range_alloc_block_size</literal>
@@ -6857,7 +6868,7 @@
 
     <para>
      The size of blocks that are allocated when doing range
-     optimization. 
+     optimization.
     </para></listitem>
 
     <listitem><para>
@@ -6866,8 +6877,9 @@
 
     <para>
      Each thread that does a sequential scan allocates a buffer of this
-     size (in bytes) for each table it scans. If you do many sequential scans, you
-     might want to increase this value, which defaults to 131072. 
+     size (in bytes) for each table it scans. If you do many sequential
+     scans, you might want to increase this value, which defaults to
+     131072.
     </para></listitem>
 
     <listitem><para>
@@ -6904,7 +6916,9 @@
      change the session variable only from within those clients that
      need to run large queries.
     </para></listitem>
+
 <!--  TODO: Cut this? -->
+
 <!--
     <listitem><para>
      <literal>safe_show_database</literal>
@@ -6923,6 +6937,7 @@
      MySQL accounts to database names.
     </para></listitem>
 -->
+
     <listitem><para>
      <literal>secure_auth</literal>
     </para>
@@ -6937,13 +6952,13 @@
 
     <para>
      You should enable this option if you want to prevent all usage of
-     passwords employing the old format (and hence insecure 
+     passwords employing the old format (and hence insecure
      communication over the network).
     </para>
 
     <para>
      Server startup fails with an error if this option is enabled and
-     the privilege tables are in pre-4.1 format. See 
+     the privilege tables are in pre-4.1 format. See
      <xref linkend="old-client"/>.
     </para>
 
@@ -6971,7 +6986,7 @@
     </para>
 
     <para>
-     (Windows only.) Whether or not the server allows shared-memory 
+     (Windows only.) Whether or not the server allows shared-memory
      connections.
     </para></listitem>
 
@@ -6980,9 +6995,9 @@
     </para>
 
     <para>
-     (Windows only.) Indicates whether or not the server allows 
-     shared-memory connections, and sets the identifier for the shared 
-     memory. This is useful when running multiple MySQL instances on a 
+     (Windows only.) Indicates whether or not the server allows
+     shared-memory connections, and sets the identifier for the shared
+     memory. This is useful when running multiple MySQL instances on a
      single physical machine.
     </para></listitem>
 
@@ -7014,16 +7029,16 @@
     <para>
      This prevents people from using the <literal>SHOW
      DATABASES</literal> statement if they do not have the <literal>SHOW
-     DATABASES</literal> privilege. This can improve security if you 
-     have concerns about users being able to see databases belonging to 
-     other users. In MySQL 5.0, its effect depends on the 
-     <literal>SHOW DATABASES</literal> privilege: If the variable value 
-     is <literal>ON</literal>, the <literal>SHOW DATABASES</literal> 
-     statement is allowed only to users who have the <literal>SHOW 
-     DATABASES</literal> privilege, and the statement displays all 
-     database names. If the value is <literal>OFF</literal>, 
-     <literal>SHOW DATABASES</literal> is allowed to all users, but 
-     displays the names of only those databases for which the user has 
+     DATABASES</literal> privilege. This can improve security if you
+     have concerns about users being able to see databases belonging to
+     other users. In MySQL 5.0, its effect depends on the <literal>SHOW
+     DATABASES</literal> privilege: If the variable value is
+     <literal>ON</literal>, the <literal>SHOW DATABASES</literal>
+     statement is allowed only to users who have the <literal>SHOW
+     DATABASES</literal> privilege, and the statement displays all
+     database names. If the value is <literal>OFF</literal>,
+     <literal>SHOW DATABASES</literal> is allowed to all users, but
+     displays the names of only those databases for which the user has
      the <literal>SHOW DATABASES</literal> or other privilege.
     </para></listitem>
 
@@ -7077,12 +7092,16 @@
     </para>
 
     <para>
-     <emphasis>Unix platforms</emphasis>: The socket file used for local 
-     client connections. Defaults to 
-     <filename>/var/lib/mysql/mysql.sock</filename>.</para>
+     <emphasis>Unix platforms</emphasis>: The socket file used for local
+     client connections. Defaults to
+     <filename>/var/lib/mysql/mysql.sock</filename>.
+    </para>
+
 <!--  TODO: Check this. Doesn't seem to be defined in 5.0.7-nt? -->
-   <para><emphasis>Windows</emphasis>: The name of the named pipe used
-     for local client connections. Defaults to <literal>mysql</literal>.
+
+    <para>
+     <emphasis>Windows</emphasis>: The name of the named pipe used for
+     local client connections. Defaults to <literal>mysql</literal>.
     </para></listitem>
 
     <listitem><para>
@@ -7101,7 +7120,7 @@
     </para>
 
     <para>
-     The current server SQL mode, which in MySQL 5.0 can be set 
+     The current server SQL mode, which in MySQL 5.0 can be set
      dynamically. See <xref linkend="server-sql-mode"/>.
     </para></listitem>
 
@@ -7119,7 +7138,7 @@
     </para>
 
     <para>
-     This variable is a synonym for <literal>table_type</literal>. In 
+     This variable is a synonym for <literal>table_type</literal>. In
      MySQL 5.0, <literal>storage_engine</literal> is the preferred name.
     </para></listitem>
 
@@ -7133,10 +7152,10 @@
      <literal>sync_binlog</literal>'th write to this binary log. Note
      that there is one write to the binary log per statement if in
      autocommit mode, and otherwise one write per transaction. The
-     default value is 0 which does no synchronising to disk. A value of 
-     1 is the safest choice, because in the event of a crash you lose at 
-     most one statement/transaction from the binary log; however, it is 
-     also the slowest choice (unless the disk has a battery-backed 
+     default value is 0 which does no synchronising to disk. A value of
+     1 is the safest choice, because in the event of a crash you lose at
+     most one statement/transaction from the binary log; however, it is
+     also the slowest choice (unless the disk has a battery-backed
      cache, which makes synchronisation very fast).
     </para></listitem>
 
@@ -7145,7 +7164,7 @@
     </para>
 
     <para>
-     If this variable is set to 1, then when a non-temporary table is 
+     If this variable is set to 1, then when a non-temporary table is
      created its <filename>.frm</filename> file is synchronised to disk
      (<literal>fdatasync()</literal>); this is slower but safer in case
      of a crash. The default is 1.
@@ -7282,11 +7301,11 @@
     </para>
 
     <para>
-     The directory used for temporary files and temporary tables.
-     This variable can be set to a list of several paths that are used 
-     in round-robin fashion. Paths should be separated by colon 
-     characters ('<literal>:</literal>') on Unix and semicolon 
-     characters ('<literal>;</literal>') on Windows, NetWare, and OS/2.
+     The directory used for temporary files and temporary tables. This
+     variable can be set to a list of several paths that are used in
+     round-robin fashion. Paths should be separated by colon characters
+     ('<literal>:</literal>') on Unix and semicolon characters
+     ('<literal>;</literal>') on Windows, NetWare, and OS/2.
     </para>
 
     <para>
@@ -7299,16 +7318,15 @@
      can replicate temporary tables or <literal>LOAD DATA
      INFILE</literal> operations. If files in the temporary file
      directory are lost when the server restarts, replication fails.
-    </para>
-    </listitem>
+    </para></listitem>
 
     <listitem><para>
      <literal>transaction_alloc_block_size</literal>
     </para>
 
     <para>
-     The allocation size (in bytes) of memory blocks that are allocated 
-     for storing queries that are part of a transaction to be stored in 
+     The allocation size (in bytes) of memory blocks that are allocated
+     for storing queries that are part of a transaction to be stored in
      the binary log when doing a commit.
     </para></listitem>
 
@@ -7319,7 +7337,7 @@
     <para>
      The size in bytes of the persistent buffer for
      <literal>transaction_alloc_blocks</literal> that is not freed
-     between queries. By making this sufficiently large to fit all 
+     between queries. By making this sufficiently large to fit all
      queries into a single transaction, you can avoid many
      <literal>malloc()</literal> calls.
     </para></listitem>
@@ -7329,7 +7347,7 @@
     </para>
 
     <para>
-     The default transaction isolation level. Defaults to 
+     The default transaction isolation level. Defaults to
      <literal>REPEATABLE-READ</literal>.
     </para></listitem>
 
@@ -7441,11 +7459,10 @@
     <title id='title-dynamic-system-variables'>&title-dynamic-system-variables;</title>
 
     <para>
-     Many server system variables are dynamic and can be set at runtime 
-     using <literal>SET GLOBAL</literal> or 
-     <literal>SET SESSION</literal>. You can also obtain their values 
-     using <literal>SELECT</literal>. See 
-     <xref linkend="system-variables"/>.
+     Many server system variables are dynamic and can be set at runtime
+     using <literal>SET GLOBAL</literal> or <literal>SET
+     SESSION</literal>. You can also obtain their values using
+     <literal>SELECT</literal>. See <xref linkend="system-variables"/>.
     </para>
 
     <para>
@@ -7575,7 +7592,6 @@
              <literal>GLOBAL</literal> | <literal>SESSION</literal>
             </entry>
           </row>
-
 <!--  Don't advertise this variable as being dynamic... -->
 <!--
         <row>
@@ -7631,12 +7647,10 @@
              string
             </entry>
             <entry>
-              <literal>GLOBAL</literal> | <literal>SESSION</literal>
+             <literal>GLOBAL</literal> | <literal>SESSION</literal>
             </entry>
           </row>
-
 <!--  next one not listed in system variable section yet -->
-
 <!--
           <row>
             <entry>
@@ -7650,7 +7664,6 @@
             </entry>
           </row>
 -->
-
 <!--  next one not listed in system variable section yet -->
 <!--
           <row>
@@ -7933,7 +7946,6 @@
             </entry>
             <entry>
              <literal>GLOBAL</literal>
-
             </entry>
           </row>
 <!--  TODO: missing key_cache_xxx variables? -->
@@ -8784,7 +8796,6 @@
              <literal>GLOBAL</literal>
             </entry>
           </row>
-
 <!--  next one not listed in system variable section yet -->
 <!--
           <row>
@@ -8903,19 +8914,19 @@
     </informaltable>
 
     <para>
-     Variables that are marked as 
+     Variables that are marked as
      <emphasis role="bold">string</emphasis> take a string value.
-     Variables that are marked as 
+     Variables that are marked as
      <emphasis role="bold">numeric</emphasis> take a numeric value.
-     Variables that are marked as 
+     Variables that are marked as
      <emphasis role="bold">boolean</emphasis> can be set to 0, 1,
      <literal>ON</literal> or <literal>OFF</literal>. Variables that are
-     marked as <emphasis role="bold">enumeration</emphasis> normally 
-     should be set to one of the available values for the variable, but 
-     can also be set to the number that corresponds to the desired 
-     enumeration value. For enumerated system variables, the first 
-     enumeration value corresponds to 0. This differs from 
-     <literal>ENUM</literal> columns, in which the first enumeration 
+     marked as <emphasis role="bold">enumeration</emphasis> normally
+     should be set to one of the available values for the variable, but
+     can also be set to the number that corresponds to the desired
+     enumeration value. For enumerated system variables, the first
+     enumeration value corresponds to 0. This differs from
+     <literal>ENUM</literal> columns, in which the first enumeration
      value corresponds to 1.
     </para>
 
@@ -8976,9 +8987,9 @@
    </para>
 
    <para>
-    The status variables have the following meanings. Variables with no 
-    version indicated were present in MySQL 5.0. For information 
-    regarding their implementation history, see 
+    The status variables have the following meanings. Variables with no
+    version indicated were present in MySQL 5.0. For information
+    regarding their implementation history, see
     <citetitle>&title-refman-previous;</citetitle>.
    </para>
 
@@ -9044,16 +9055,16 @@
 
     <para>
      The <literal>Com_<replaceable>xxx</replaceable></literal> statement
-     counter variables indicate the number of times each 
-     <replaceable>xxx</replaceable> statement has been executed. There 
-     is one status variable for each type of statement. For example, 
-     <literal>Com_delete</literal> and <literal>Com_insert</literal> 
-     count <literal>DELETE</literal> and <literal>INSERT</literal> 
+     counter variables indicate the number of times each
+     <replaceable>xxx</replaceable> statement has been executed. There
+     is one status variable for each type of statement. For example,
+     <literal>Com_delete</literal> and <literal>Com_insert</literal>
+     count <literal>DELETE</literal> and <literal>INSERT</literal>
      statements, respectively.
     </para>
 
     <para>
-     The <literal>Com_stmt_<replaceable>xxx</replaceable></literal> 
+     The <literal>Com_stmt_<replaceable>xxx</replaceable></literal>
      status variables were added in 5.0.8:
 
      <itemizedlist>
@@ -9113,9 +9124,9 @@
     <para>
      All of the
      <literal>Com_stmt_<replaceable>xxx</replaceable></literal>
-     variables are increased even if a prepared statement argument is 
-     unknown or an error occurred during execution. In other words, 
-     their values correspond to the number of requests issued, not to 
+     variables are increased even if a prepared statement argument is
+     unknown or an error occurred during execution. In other words,
+     their values correspond to the number of requests issued, not to
      the number of requests successfully completed.
     </para></listitem>
 
@@ -9347,8 +9358,8 @@
 
     <para>
      The number of latched pages in <literal>InnoDB</literal> buffer
-     pool. These are pages currently being read or written or that 
-     cannot be flushed or removed for some other reason. Added in MySQL 
+     pool. These are pages currently being read or written or that
+     cannot be flushed or removed for some other reason. Added in MySQL
      5.0.2.
     </para></listitem>
 
@@ -9406,7 +9417,9 @@
     <listitem><para>
      <literal>Innodb_buffer_pool_reads</literal>
     </para>
+
 <!--  TODO: Clarify.  -->
+
     <para>
      The number of logical reads that <literal>InnoDB</literal> could
      not satisfy from the buffer pool and had to do a single-page read.
@@ -9416,13 +9429,15 @@
     <listitem><para>
      <literal>Innodb_buffer_pool_wait_free</literal>
     </para>
+
 <!--  TODO: How small is "small"?  -->
+
     <para>
      Normally, writes to the <literal>InnoDB</literal> buffer pool
      happen in the background. However, if it is necessary to read or
-     create a page and no clean pages are available, then it is also 
-     necessary to wait for pages to be flushed first. This counter 
-     counts instances of these waits. If the buffer pool size has been 
+     create a page and no clean pages are available, then it is also
+     necessary to wait for pages to be flushed first. This counter
+     counts instances of these waits. If the buffer pool size has been
      set properly, this value should be small. Added in MySQL 5.0.2.
     </para></listitem>
 
@@ -9472,7 +9487,9 @@
     <listitem><para>
      <literal>Innodb_data_read</literal>
     </para>
+
 <!--  TODO: Explain "so far". Since the server was restarted? -->
+
     <para>
      The amount of data read so far, in bytes. Added in MySQL 5.0.2.
     </para></listitem>
@@ -9496,7 +9513,9 @@
     <listitem><para>
      <literal>Innodb_data_written</literal>
     </para>
+
 <!--  TODO: Explain "so far". Since the server was restarted? -->
+
     <para>
      The amount of data written so far, in bytes. Added in MySQL 5.0.2.
     </para></listitem>
@@ -9507,8 +9526,8 @@
     </para>
 
     <para>
-     The number of doublewrite operations that have been performed and 
-     the number of pages that have been written for this purpose. Added 
+     The number of doublewrite operations that have been performed and
+     the number of pages that have been written for this purpose. Added
      in MySQL 5.0.2. See <xref linkend="innodb-disk-i-slash-o"/>.
     </para></listitem>
 
@@ -9544,7 +9563,7 @@
     </para>
 
     <para>
-     The number of <literal>fsync()</literal> writes done to the log 
+     The number of <literal>fsync()</literal> writes done to the log
      file. Added in MySQL 5.0.2.
     </para></listitem>
 
@@ -9553,8 +9572,8 @@
     </para>
 
     <para>
-      The number of pending log file <literal>fsync()</literal> 
-      operations. Added in MySQL 5.0.2.
+     The number of pending log file <literal>fsync()</literal>
+     operations. Added in MySQL 5.0.2.
     </para></listitem>
 
     <listitem><para>
@@ -9754,18 +9773,20 @@
      The number of physical writes of a key block to disk.
     </para></listitem>
 
-    <listitem>
-      <para><literal>Last_query_cost</literal></para>
+    <listitem><para>
+     <literal>Last_query_cost</literal>
+    </para>
 
-      <para>The total cost of the last compiled query as computed by the
-      query optimizer. Useful for comparing the cost of different query
-      plans for the same query. The default value of 0 means that no
-      query has been compiled yet. This variable was added in MySQL
-      5.0.1, with a default value of -1. In MySQL 5.0.7, the default was
-      changed to 0; also in version 5.0.7, the scope of
-      <literal>Last_query_cost</literal> was changed to session rather
-      than global.</para>
-    </listitem>
+    <para>
+     The total cost of the last compiled query as computed by the query
+     optimizer. Useful for comparing the cost of different query plans
+     for the same query. The default value of 0 means that no query has
+     been compiled yet. This variable was added in MySQL 5.0.1, with a
+     default value of -1. In MySQL 5.0.7, the default was changed to 0;
+     also in version 5.0.7, the scope of
+     <literal>Last_query_cost</literal> was changed to session rather
+     than global.
+    </para></listitem>
 
     <listitem><para>
      <literal>Max_used_connections</literal>
@@ -9923,8 +9944,10 @@
     </para>
 
     <para>
-     The number of joins that used ranges on the first table. 
+     The number of joins that used ranges on the first table.
+
 <!--  TODO: Why not? Why the comment, if it's not important? -->
+
      It is normally not a critical issue even if this is quite large.
     </para></listitem>
 
@@ -9970,7 +9993,7 @@
 
     <para>
      Total number of times since startup that the replication slave SQL
-     thread has retried transactions. For the MySQL 5.0 series of 
+     thread has retried transactions. For the MySQL 5.0 series of
      releases, this variable was added in version 5.0.4.
     </para></listitem>
 
@@ -10182,8 +10205,7 @@
 
 <programlisting>
 Error: Can't create thread to kill server
-</programlisting>
-   </listitem>
+</programlisting></listitem>
 
    <listitem><para>
     The server stops accepting new connections.
@@ -10325,7 +10347,7 @@
     </para></listitem>
 
     <listitem><para>
-     Learn the MySQL access privilege system. The 
+     Learn the MySQL access privilege system. The
      <literal>GRANT</literal> and <literal>REVOKE</literal> statements
      are used for controlling access to MySQL. Do not grant more
      privileges than necessary. Never grant privileges to all hosts.
@@ -10403,7 +10425,7 @@
       If you get a connection and some garbage characters, the port is
       open, and should be closed on your firewall or router, unless you
       really have a good reason to keep it open. If
-      <literal>telnet</literal> hangs or the connection is refused, then 
+      <literal>telnet</literal> hangs or the connection is refused, then
       the port is blocked, which is how you want it to be.
      </para></listitem>
 
@@ -10432,9 +10454,9 @@
      load. The simplest way to protect from this type of attack is to
      use single quotes around the numeric constants: <literal>SELECT *
      FROM table WHERE ID='234'</literal>. If the user enters extra
-     information, it all becomes part of the string. In a numeric 
-     context, MySQL automatically converts this string to a number and 
-     strips any trailing non-numeric characters which the string may 
+     information, it all becomes part of the string. In a numeric
+     context, MySQL automatically converts this string to a number and
+     strips any trailing non-numeric characters which the string may
      contain.
     </para>
 
@@ -10455,8 +10477,8 @@
     <itemizedlist>
 
      <listitem><para>
-      Try to enter single and double quote marks ('<literal>'</literal>' 
-      and '<literal>"</literal>') in all of your Web forms. If you get 
+      Try to enter single and double quote marks ('<literal>'</literal>'
+      and '<literal>"</literal>') in all of your Web forms. If you get
       any kind of MySQL error, investigate the problem right away.
      </para></listitem>
 
@@ -10468,7 +10490,7 @@
      </para></listitem>
 
      <listitem><para>
-      Try to modify data types in dynamic URLs from numeric to character 
+      Try to modify data types in dynamic URLs from numeric to character
       types using the characters shown in the previous examples. Your
       application should be safe against these and similar attacks.
      </para></listitem>
@@ -10485,8 +10507,8 @@
      </para></listitem>
 
      <listitem><para>
-      Have your application connect to the database using a different 
-      username than the one you use for administrative purposes. Do not 
+      Have your application connect to the database using a different
+      username than the one you use for administrative purposes. Do not
       give your applications any access privileges they do not need.
      </para></listitem>
 
@@ -10516,9 +10538,9 @@
       PHP: Use the <literal>mysql_escape_string()</literal> function,
       which is based on the function of the same name in the MySQL C
       API. (Prior to PHP 4.0.3, use <literal>addslashes()</literal>
-      instead.) In PHP 5, you can use the <literal>mysqli</literal> 
-      extension, which supports the improved MySQL authentication 
-      protocol and passwords, as well as prepared statements with 
+      instead.) In PHP 5, you can use the <literal>mysqli</literal>
+      extension, which supports the improved MySQL authentication
+      protocol and passwords, as well as prepared statements with
       placeholders.
      </para></listitem>
 
@@ -10588,23 +10610,23 @@
     When you connect to a MySQL server, you should use a password. The
     password is not transmitted in clear text over the connection.
     Password handling during the client connection sequence was upgraded
-    in MySQL 4.1.1 to be very secure. If you are still using 
+    in MySQL 4.1.1 to be very secure. If you are still using
     pre-4.1.1-style passwords, the encryption algorithm is not as strong
-    as the newer algorithm; with some effort a clever attacker who can 
-    sniff the traffic between the client and the server can crack the 
-    password. (See <xref linkend="password-hashing"/> for a discussion 
-    of the different password handling methods.) If the connection 
-    between the client and the server goes through an untrusted network, 
+    as the newer algorithm; with some effort a clever attacker who can
+    sniff the traffic between the client and the server can crack the
+    password. (See <xref linkend="password-hashing"/> for a discussion
+    of the different password handling methods.) If the connection
+    between the client and the server goes through an untrusted network,
     you should use an SSH tunnel to encrypt the communication.
    </para>
 
    <para>
     All other information is transferred as text, and can be read by
     anyone who is able to watch the connection. If you are concerned
-    about this, you can use the compressed protocol to make traffic much 
-    more difficult to decipher. To make the connection even more secure, 
-    you should use SSH to get an encrypted TCP/IP connection between a 
-    MySQL server and a MySQL client. You can find an Open Source SSH 
+    about this, you can use the compressed protocol to make traffic much
+    more difficult to decipher. To make the connection even more secure,
+    you should use SSH to get an encrypted TCP/IP connection between a
+    MySQL server and a MySQL client. You can find an Open Source SSH
     client at
     <ulink url="http://www.openssh.org/">http://www.openssh.org/</ulink>,
     and a commercial SSH client at
@@ -10612,7 +10634,7 @@
    </para>
 
    <para>
-    In MySQL 5.0, you can also use internal OpenSSL support. See 
+    In MySQL 5.0, you can also use internal OpenSSL support. See
     <xref linkend="secure-connections"/>.
    </para>
 
@@ -10653,8 +10675,8 @@
 </programlisting></listitem>
 
     <listitem><para>
-     Never run the MySQL server as the Unix <literal>root</literal> user. 
-     This is extremely dangerous, because any user with the
+     Never run the MySQL server as the Unix <literal>root</literal>
+     user. This is extremely dangerous, because any user with the
      <literal>FILE</literal> privilege is able to create files as
      <literal>root</literal> (for example,
      <literal>~root/.bashrc</literal>). To prevent this,
@@ -10664,9 +10686,9 @@
     </para>
 
     <para>
-     <command>mysqld</command> can (and should) be run as an ordinary 
-     unprivileged user instead. You can create a separate Unix account 
-     named <literal>mysql</literal> to make everything even more secure. 
+     <command>mysqld</command> can (and should) be run as an ordinary
+     unprivileged user instead. You can create a separate Unix account
+     named <literal>mysql</literal> to make everything even more secure.
      Use this account only for administering MySQL. To start
      <command>mysqld</command> as a different Unix user, add a
      <literal>user</literal> option that specifies the username to the
@@ -10715,9 +10737,9 @@
      Don't grant the <literal>PROCESS</literal> or
      <literal>SUPER</literal> privilege to non-administrative users. The
      output of <command>mysqladmin processlist</command> shows the text
-     of any executing queries currently being executed, so any user who 
-     is allowed to run that command might be able to see if another user 
-     issues an <literal>UPDATE user SET 
+     of any executing queries currently being executed, so any user who
+     is allowed to run that command might be able to see if another user
+     issues an <literal>UPDATE user SET
      password=PASSWORD('not_secure')</literal> query.
     </para>
 
@@ -10801,7 +10823,7 @@
      loaded. By default, the option is off and only UDFs that have at
      least one auxiliary symbol can be loaded. This prevents attempts at
      loading functions from shared object files other than those
-     containing legitimate UDFs. For MySQL 5.0, this option was added in 
+     containing legitimate UDFs. For MySQL 5.0, this option was added in
      MySQL 5.0.3. See <xref linkend="udf-security"/>.
     </para></listitem>
 
@@ -10827,17 +10849,18 @@
     </para></listitem>
 
     <listitem><para>
-     (<emphasis>OBSOLETE</emphasis>) <literal>--safe-show-database</literal>
+     (<emphasis>OBSOLETE</emphasis>)
+     <literal>--safe-show-database</literal>
     </para>
 
     <para>
-     In previous versions of MySQL, this option caused the <literal>SHOW 
-     DATABASES</literal> statement to display the names of only those 
-     databases for which the user had some kind of privilege. In MySQL 
-     5.0, this option is no longer available as this is now the default 
-     behaviour, and there is a <literal>SHOW DATABASES</literal> 
-     privilege that can be used to control access to database names on 
-     a per-account basis. See <xref linkend="grant"/>.
+     In previous versions of MySQL, this option caused the <literal>SHOW
+     DATABASES</literal> statement to display the names of only those
+     databases for which the user had some kind of privilege. In MySQL
+     5.0, this option is no longer available as this is now the default
+     behaviour, and there is a <literal>SHOW DATABASES</literal>
+     privilege that can be used to control access to database names on a
+     per-account basis. See <xref linkend="grant"/>.
     </para></listitem>
 
     <listitem><para>
@@ -11019,8 +11042,7 @@
 <programlisting>
 [client]
 loose-local-infile=1
-</programlisting>
-    </listitem>
+</programlisting></listitem>
 
     <listitem><para>
      If <literal>LOAD DATA LOCAL INFILE</literal> is disabled, either in
@@ -11383,7 +11405,6 @@
             <literal>Show_view_priv</literal>
            </entry>
          </row>
-
 <!--  
       TODO: Create_routine_priv, Alter_routine_priv need to be added to host
       table, but that hasn't happened yet. 
@@ -11587,9 +11608,10 @@
        </tbody>
      </tgroup>
    </informaltable>
-   
-   <para><literal>Execute_priv</literal> was present in MySQL 5.0.0, but 
-    did not become operational until MySQL 5.0.3.
+
+   <para>
+    <literal>Execute_priv</literal> was present in MySQL 5.0.0, but did
+    not become operational until MySQL 5.0.3.
    </para>
 
    <para>
@@ -12495,14 +12517,14 @@
    <para>
     <literal>CREATE VIEW</literal> and <literal>SHOW VIEW</literal> were
     added in MySQL 5.0.1. <literal>CREATE USER</literal>,
-    <literal>CREATE ROUTINE</literal>, and <literal>ALTER 
-    ROUTINE</literal> were added in MySQL 5.0.3. Although 
-    <literal>EXECUTE</literal> was present in MySQL 5.0.0, it did not 
-    become operational until MySQL 5.0.3. To use these privileges when 
-    upgrading from an earlier version of MySQL that does not have them, 
-    you must upgrade your grant tables using the 
-    <command>mysql_fix_privilege_tables</command> script provided with 
-    the MySQL distribution. See 
+    <literal>CREATE ROUTINE</literal>, and <literal>ALTER
+    ROUTINE</literal> were added in MySQL 5.0.3. Although
+    <literal>EXECUTE</literal> was present in MySQL 5.0.0, it did not
+    become operational until MySQL 5.0.3. To use these privileges when
+    upgrading from an earlier version of MySQL that does not have them,
+    you must upgrade your grant tables using the
+    <command>mysql_fix_privilege_tables</command> script provided with
+    the MySQL distribution. See
     <xref linkend="upgrading-grant-tables"/>.
    </para>
 
@@ -13066,8 +13088,8 @@
     </indexterm></listitem>
 
     <listitem><para>
-     For <literal>Host</literal> values specified as IP numbers, you can 
-     specify a netmask indicating how many address bits to use for the 
+     For <literal>Host</literal> values specified as IP numbers, you can
+     specify a netmask indicating how many address bits to use for the
      network number. For example:
     </para>
 
@@ -13102,20 +13124,23 @@
     </para></listitem>
 
     <listitem><para>
-     Note: The netmask can only be used to tell the server to
-     use 8, 16, 24, or 32 bits of the address, for example:
-     <programlisting>
+     Note: The netmask can only be used to tell the server to use 8, 16,
+     24, or 32 bits of the address, for example:
+
+<programlisting>
 192.0.0.0/255.0.0.0 (anything on the 192 class A network)
 192.168.0.0/255.255.0.0 (anything on the 192.168 class B network)
 192.168.1.0/255.255.255.0 (anything on the 192.168.1 class C network)
 192.168.1.1 (only this specific IP) 
      </programlisting>
+
      The following netmask (28 bits) will not work:
-     <programlisting>
+
+<programlisting>
 192.168.0.1/255.255.255.240
      </programlisting>
-    </para></listitem> 
-    
+    </para></listitem>
+
     <listitem><para>
      A blank <literal>Host</literal> value in a <literal>db</literal>
      table record means that its privileges should be combined with
@@ -13187,10 +13212,10 @@
    </para>
 
    <para>
-    MySQL 5.0 employs the stronger authentication method (first 
-    implemented in MySQL 4.1) that has better password protection during 
-    the connection process than in earlier versions. It is secure even 
-    if TCP/IP packets are sniffed or the <literal>mysql</literal> 
+    MySQL 5.0 employs the stronger authentication method (first
+    implemented in MySQL 4.1) that has better password protection during
+    the connection process than in earlier versions. It is secure even
+    if TCP/IP packets are sniffed or the <literal>mysql</literal>
     database is captured. Password encryption is discussed further in
     <xref linkend="password-hashing"/>.
    </para>
@@ -13506,9 +13531,9 @@
    </para>
 
    <para>
-    Another thing you can do to diagnose authentication problems is to 
-    print out the <literal>user</literal> table and sort it by hand to 
-    see where the first match is being made. See also 
+    Another thing you can do to diagnose authentication problems is to
+    print out the <literal>user</literal> table and sort it by hand to
+    see where the first match is being made. See also
     <xref linkend="information-functions"/>.
    </para>
 
@@ -13576,7 +13601,7 @@
      same meaning as for pattern-matching operations performed with the
      <literal>LIKE</literal> operator. If you want to use either
      character literally when granting privileges, you must escape it
-     with a backslash. For example, to include the underscore character  
+     with a backslash. For example, to include the underscore character
      ('<literal>_</literal>') as part of a database name, specify it as
      '<literal>\_</literal>' in the <literal>GRANT</literal> statement.
     </para></listitem>
@@ -14179,7 +14204,7 @@
      with MySQL 5.0.2) <literal>CREATE USER</literal> statements, or the
      <command>mysqladmin password</command> command, all of which
      automatically use <literal>PASSWORD()</literal> to encrypt the
-     password. See <xref linkend="passwords"/> and 
+     password. See <xref linkend="passwords"/> and
      <xref linkend="create-user"/>.
     </para></listitem>
 
@@ -14562,21 +14587,23 @@
     <literal>GRANT</literal> or <literal>SET PASSWORD</literal>
     statement to set or change a password.
    </para>
+
 <!--  
       TODO: We could stand to come up with some terminology for this 
       that doesn't use version numbers directly.  
 -->
+
    <para>
     The password hashing mechanism was updated in MySQL 4.1 to provide
     better security and to reduce the risk of passwords being
     intercepted. However, this new mechanism is understood only by MySQL
-    4.1 (and newer) servers and clients, which can result in some compatibility
-    problems. A 4.1 or newer client can connect to a pre-4.1 server, because the
-    client understands both the old and new password hashing mechanisms.
-    However, a pre-4.1 client that attempts to connect to a 4.1 or newer 
-    server may run into difficulties. For example, a 3.23
-    <command>mysql</command> client that attempts to connect to a 5.0
-    server may fail with the following error message:
+    4.1 (and newer) servers and clients, which can result in some
+    compatibility problems. A 4.1 or newer client can connect to a
+    pre-4.1 server, because the client understands both the old and new
+    password hashing mechanisms. However, a pre-4.1 client that attempts
+    to connect to a 4.1 or newer server may run into difficulties. For
+    example, a 3.23 <command>mysql</command> client that attempts to
+    connect to a 5.0 server may fail with the following error message:
    </para>
 
 <programlisting>
@@ -14594,13 +14621,13 @@
    <para>
     The following discussion describes the differences between the old
     and new password mechanisms, and what you should do if you upgrade
-    your server but need to maintain backward compatibility with
-    pre-4.1 clients. Additional information can be found in
+    your server but need to maintain backward compatibility with pre-4.1
+    clients. Additional information can be found in
     <xref linkend="old-client"/>. This information is of particular
     importance to PHP programmers migrating MySQL databases from version
     4.0 or lower to version 4.1 or higher.
    </para>
-   
+
 <!--  TODO; Cut this paragraph?   -->
 
    <para>
@@ -14662,11 +14689,11 @@
     </para></listitem>
 
     <listitem><para>
-     Upgrading from MySQL 4.1 (4.1.1 or later in the 4.1 series) to 
-     MySQL 5.0 should not give rise to any issues in this regard, since 
-     both versions use the same password hashing mechanism. If you wish 
-     to upgrade an older release of MySQL to version 5.0, you should 
-     upgrade to version 4.1 first, then upgrade the 4.1 installation to 
+     Upgrading from MySQL 4.1 (4.1.1 or later in the 4.1 series) to
+     MySQL 5.0 should not give rise to any issues in this regard, since
+     both versions use the same password hashing mechanism. If you wish
+     to upgrade an older release of MySQL to version 5.0, you should
+     upgrade to version 4.1 first, then upgrade the 4.1 installation to
      5.0.
     </para></listitem>
 
@@ -14731,8 +14758,8 @@
      </para></listitem>
 
      <listitem><para>
-      4.1 and later clients can authenticate for accounts that have short or long
-      hashes.
+      4.1 and later clients can authenticate for accounts that have
+      short or long hashes.
      </para></listitem>
 
     </itemizedlist></listitem>
@@ -14741,7 +14768,7 @@
 
    <para>
     For short-hash accounts, the authentication process is actually a
-    bit more secure for 4.1 and later clients than for older clients. In 
+    bit more secure for 4.1 and later clients than for older clients. In
     terms of security, the gradient from least to most secure is:
    </para>
 
@@ -14764,10 +14791,10 @@
    <para>
     The way in which the server generates password hashes for connected
     clients is affected by the width of the <literal>Password</literal>
-    column and by the <literal>--old-passwords</literal> option. A 4.1 
-    or later server generates long hashes only if certain conditions are 
-    met: The <literal>Password</literal> column must be wide enough to 
-    hold long values and the <literal>--old-passwords</literal> option 
+    column and by the <literal>--old-passwords</literal> option. A 4.1
+    or later server generates long hashes only if certain conditions are
+    met: The <literal>Password</literal> column must be wide enough to
+    hold long values and the <literal>--old-passwords</literal> option
     must not be given. These conditions apply as follows:
    </para>
 
@@ -14802,8 +14829,8 @@
     The purpose of the <literal>--old-passwords</literal> option is to
     allow you to maintain backward compatibility with pre-4.1 clients
     under circumstances where the server would otherwise generate long
-    password hashes. The option doesn't affect authentication (4.1 and 
-    later clients can still use accounts that have long password 
+    password hashes. The option doesn't affect authentication (4.1 and
+    later clients can still use accounts that have long password
     hashes), but it does prevent creation of a long password hash in the
     <literal>user</literal> table as the result of a password-changing
     operation. Were that to occur, the account no longer could be used
@@ -14828,8 +14855,8 @@
      The next time the old client attempts to connect to the account, it
      cannot, because the account has a long password hash that requires
      the new hashing mechanism during authentication. (Once an account
-     has a long password hash in the user table, only 4.1 and later 
-     clients can authenticate for it, because pre-4.1 clients do not 
+     has a long password hash in the user table, only 4.1 and later
+     clients can authenticate for it, because pre-4.1 clients do not
      understand long hashes.)
     </para></listitem>
 
@@ -14837,7 +14864,7 @@
 
    <para>
     This scenario illustrates that, if you must support older pre-4.1
-    clients, it is dangerous to run a 4.1 or newer server without using 
+    clients, it is dangerous to run a 4.1 or newer server without using
     the <literal>--old-passwords</literal> option. By running the server
     with <literal>--old-passwords</literal>, password-changing
     operations do not generate long password hashes and thus do not
@@ -14856,7 +14883,7 @@
    </para>
 
    <para>
-    The following scenarios are possible for running a 4.1 or later 
+    The following scenarios are possible for running a 4.1 or later
     server, including MySQL 5.0 servers:
    </para>
 
@@ -14906,7 +14933,7 @@
     </para></listitem>
 
     <listitem><para>
-     4.1 and later clients (including 5.0 clients) can authenticate for 
+     4.1 and later clients (including 5.0 clients) can authenticate for
      accounts that have short or long hashes.
     </para></listitem>
 
@@ -14974,15 +15001,15 @@
     </para></listitem>
 
     <listitem><para>
-      4.1 and later clients can authenticate for accounts that have short 
-      or long hashes (but note that it is possible to create long hashes 
-      only when the server is started without 
-      <literal>--old-passwords</literal>).
+     4.1 and later clients can authenticate for accounts that have short
+     or long hashes (but note that it is possible to create long hashes
+     only when the server is started without
+     <literal>--old-passwords</literal>).
     </para></listitem>
 
     <listitem><para>
-      Pre-4.1 clients can authenticate only for accounts that have short
-      hashes.
+     Pre-4.1 clients can authenticate only for accounts that have short
+     hashes.
     </para></listitem>
 
     <listitem><para>
@@ -15034,27 +15061,27 @@
     <title id='title-application-password-use'>&title-application-password-use;</title>
 
     <para>
-      An upgrade to MySQL version 4.1 or later can cause compatibility 
-      issues for applications that use <literal>PASSWORD()</literal> to 
-      generate passwords for their own purposes. Applications really 
-      should not do this, because <literal>PASSWORD()</literal> should 
-      be used only to manage passwords for MySQL accounts. But some 
-      applications use <literal>PASSWORD()</literal> for their own 
-      purposes anyway.
+     An upgrade to MySQL version 4.1 or later can cause compatibility
+     issues for applications that use <literal>PASSWORD()</literal> to
+     generate passwords for their own purposes. Applications really
+     should not do this, because <literal>PASSWORD()</literal> should be
+     used only to manage passwords for MySQL accounts. But some
+     applications use <literal>PASSWORD()</literal> for their own
+     purposes anyway.
     </para>
 
     <para>
-      If you upgrade to 4.1 or later from a pre-4.1 version of MySQL and 
-      run the server under conditions where it generates long password 
-      hashes, an application using <literal>PASSWORD()</literal> for its 
-      own passwords breaks. The recommended course of action in such 
-      cases is to modify the application to use another function, such 
-      as <literal>SHA1()</literal> or <literal>MD5()</literal>, to 
-      produce hashed values. If that is not possible, you can use the 
-      <literal>OLD_PASSWORD()</literal> function, which is provided for 
-      generate short hashes in the old format. However, you should note 
-      that <literal>OLD_PASSWORD()</literal> may one day no longer be 
-      supported.
+     If you upgrade to 4.1 or later from a pre-4.1 version of MySQL and
+     run the server under conditions where it generates long password
+     hashes, an application using <literal>PASSWORD()</literal> for its
+     own passwords breaks. The recommended course of action in such
+     cases is to modify the application to use another function, such as
+     <literal>SHA1()</literal> or <literal>MD5()</literal>, to produce
+     hashed values. If that is not possible, you can use the
+     <literal>OLD_PASSWORD()</literal> function, which is provided for
+     generate short hashes in the old format. However, you should note
+     that <literal>OLD_PASSWORD()</literal> may one day no longer be
+     supported.
     </para>
 
     <para>
@@ -15071,10 +15098,10 @@
 
    </section>
 
+  </section>
+
  </section>
- 
- 
- </section>
+
  <section id="user-account-management">
 
   <title id='title-user-account-management'>&title-user-account-management;</title>
@@ -15148,30 +15175,29 @@
      to the server.
     </para></listitem>
 
-    <listitem>
-      <para>
-        MySQL usernames can be up to a maximum of 16 characters long. 
-        This limit is hard-coded in the MySQL servers and clients, and 
-        trying to cirumvent it by modifying the definitions of the 
-        tables in the <literal>mysql</literal> database <emphasis>does 
-        not work</emphasis>.
-      </para>
-      <para><emphasis role="bold">Note</emphasis>: <emphasis>You should 
-        never alter any of the tables in the <literal>mysql</literal> 
-        database in any manner whatsoever except by running the scripts 
-        supplied expressly for this purpose with the MySQL distribution. 
-        Attempting to redefine MySQL's system tables in any other 
-        fashion results in undefined (and unsupported!) 
-        behaviour</emphasis>.
-      </para>
-      <para>
-        Operating system usernames are completely unrelated to MySQL 
-        usernames and may even be of a different maximum length. For 
-        example, Unix usernames typically are limited to eight 
-        characters.
-      </para>
-    </listitem> 
-    
+    <listitem><para>
+     MySQL usernames can be up to a maximum of 16 characters long. This
+     limit is hard-coded in the MySQL servers and clients, and trying to
+     cirumvent it by modifying the definitions of the tables in the
+     <literal>mysql</literal> database <emphasis>does not
+     work</emphasis>.
+    </para>
+
+    <para>
+     <emphasis role="bold">Note</emphasis>: <emphasis>You should never
+     alter any of the tables in the <literal>mysql</literal> database in
+     any manner whatsoever except by running the scripts supplied
+     expressly for this purpose with the MySQL distribution. Attempting
+     to redefine MySQL's system tables in any other fashion results in
+     undefined (and unsupported!) behaviour</emphasis>.
+    </para>
+
+    <para>
+     Operating system usernames are completely unrelated to MySQL
+     usernames and may even be of a different maximum length. For
+     example, Unix usernames typically are limited to eight characters.
+    </para></listitem>
+
     <listitem><para>
      MySQL passwords have nothing to do with passwords for logging in to
      your operating system. There is no necessary connection between the
@@ -15252,7 +15278,9 @@
     is <emphasis>not</emphasis> interpreted as a password, because it is
     separated from the preceding password option by a space.)
    </para>
+
 <!--  TODO: Which operating systems?  -->
+
    <para>
     On some systems, the library call that MySQL uses to prompt for a
     password automatically limits the password to eight characters. That
@@ -15446,7 +15474,7 @@
    <para>
     As an alternative to <literal>GRANT</literal>, you can create the
     same accounts directly by issuing <literal>INSERT</literal>
-    statements and then telling the server to reload the grant tables 
+    statements and then telling the server to reload the grant tables
     using <literal>FLUSH PRIVILEGES</literal>:
    </para>
 
@@ -15482,8 +15510,8 @@
 
    <para>
     The <literal>'Y'</literal> values enable privileges for the
-    accounts. For the <literal>admin</literal> account, you may also 
-    employ the more readable extended <literal>INSERT</literal> syntax 
+    accounts. For the <literal>admin</literal> account, you may also
+    employ the more readable extended <literal>INSERT</literal> syntax
     using <literal>SET</literal>.
    </para>
 
@@ -15705,16 +15733,16 @@
    <para>
     One means of limiting use of MySQL server resources is to set the
     <literal>max_user_connections</literal> system variable to a
-    non-zero value. However, this method is strictly global, and does 
-    not allow for management of individual accounts. In addition, it 
-    limits only the number of simultaneous connections made using a 
-    single account, and not what a client can do once connected. Both 
-    types of control are interest to many MySQL administrators, 
+    non-zero value. However, this method is strictly global, and does
+    not allow for management of individual accounts. In addition, it
+    limits only the number of simultaneous connections made using a
+    single account, and not what a client can do once connected. Both
+    types of control are interest to many MySQL administrators,
     particularly those working for Internet Service Providers.
    </para>
 
    <para>
-    In MySQL 5.0, you can limit the following server resources for 
+    In MySQL 5.0, you can limit the following server resources for
     individual accounts:
    </para>
 
@@ -16014,6 +16042,7 @@
       Unnecessarily complex for the explanation below, but it may be useful 
       at some point to include this elsewhere:
 -->
+
 <!-- 
     <para>
       When the user <literal>jeffrey</literal> attempts to connect to 
@@ -16044,8 +16073,8 @@
    <para>
     If you set passwords using the <literal>GRANT ... IDENTIFIED
     BY</literal> statement or the <command>mysqladmin password</command>
-    command, they both take care of encrypting the password for you. In 
-    these cases, using <literal>PASSWORD()</literal> function is 
+    command, they both take care of encrypting the password for you. In
+    these cases, using <literal>PASSWORD()</literal> function is
     unnecessary.
    </para>
 
@@ -16205,9 +16234,9 @@
    </indexterm>
 
    <para>
-    MySQL 5.0 includes support for secure (encrypted) connections 
-    between MySQL clients and the server using the Secure Sockets Layer 
-    (SSL) protocol. This section discusses how to use SSL connections. 
+    MySQL 5.0 includes support for secure (encrypted) connections
+    between MySQL clients and the server using the Secure Sockets Layer
+    (SSL) protocol. This section discusses how to use SSL connections.
     It also describes a way to set up SSH on Windows.
    </para>
 
@@ -16733,7 +16762,7 @@
     </para>
 
     <para>
-     In MySQL 5.0, the <literal>AND</literal> keyword is optional 
+     In MySQL 5.0, the <literal>AND</literal> keyword is optional
      between <literal>REQUIRE</literal> options.
     </para>
 
@@ -16754,8 +16783,8 @@
 
     <para>
      The following list describes options that are used for specifying
-     the use of SSL, certificate files, and key files. They may be 
-     given on the command line or in an option file.
+     the use of SSL, certificate files, and key files. They may be given
+     on the command line or in an option file.
     </para>
 
     <itemizedlist>
@@ -16987,9 +17016,9 @@
     If you want to make an SQL-level backup of a table, you can use
     <literal>SELECT INTO ... OUTFILE</literal> or <literal>BACKUP
     TABLE</literal>. For <literal>SELECT INTO ... OUTFILE</literal>, the
-    output file cannot previously exist. This is also true of 
-    <literal>BACKUP TABLE</literal>, since allowing extant files to be 
-    overwritten would constitute a security risk. See 
+    output file cannot previously exist. This is also true of
+    <literal>BACKUP TABLE</literal>, since allowing extant files to be
+    overwritten would constitute a security risk. See
     <xref linkend="select"/> and <xref linkend="backup-table"/>.
    </para>
 
@@ -17113,14 +17142,13 @@
 </programlisting>
 
     <para>
-     In some cases, you may want to re-run only certain binary logs, 
-     from certain positions (usually you want to re-run all binary logs 
-     from the date of the restored backup, excepting possibly some 
-     incorrect queries). See <xref linkend="mysqlbinlog"/> for more 
-     information on the <command>mysqlbinlog</command> utility and how 
+     In some cases, you may want to re-run only certain binary logs,
+     from certain positions (usually you want to re-run all binary logs
+     from the date of the restored backup, excepting possibly some
+     incorrect queries). See <xref linkend="mysqlbinlog"/> for more
+     information on the <command>mysqlbinlog</command> utility and how
      to use it.
-    </para>
-  </listitem>
+    </para></listitem>
 
    </orderedlist>
 
@@ -17224,10 +17252,10 @@
    </para>
 
    <para>
-    We'll assume that data is stored in MySQL's 
-    <literal>InnoDB</literal> storage engine, which has support for 
-    transactions and automatic crash recovery. We'll always assume that 
-    the MySQL server is under load at the time of crash. If it were not, 
+    We'll assume that data is stored in MySQL's
+    <literal>InnoDB</literal> storage engine, which has support for
+    transactions and automatic crash recovery. We'll always assume that
+    the MySQL server is under load at the time of crash. If it were not,
     no recovery would ever be needed.
    </para>
 
@@ -17238,9 +17266,9 @@
     data due to the crash, but <literal>InnoDB</literal> reads its logs
     and finds in them the list of pending committed and non-committed
     transactions that have not been flushed to the data files.
-    <literal>InnoDB</literal> automatically rolls back those 
-    transactions that were not committed, and flushes to its data files 
-    those that were. Information about this recovery process is conveyed 
+    <literal>InnoDB</literal> automatically rolls back those
+    transactions that were not committed, and flushes to its data files
+    those that were. Information about this recovery process is conveyed
     to the user through the MySQL error log. The following is an example
     log excerpt:
    </para>
@@ -17270,15 +17298,15 @@
 </programlisting>
 
    <para>
-    In cases of filesystem crashes or hardware problems, we can
-    assume that the MySQL disk data is <emphasis>not</emphasis>
-    available after a restart. This means that MySQL fails to start
-    successfully because some blocks of disk data are no longer
-    readable. In this case, it's necessary to reformat the disk, install
-    a new one, or otherwise correct the underlying problem. Then it's
-    necessary to recover our MySQL data from backups, which means that
-    we must already have made backups. To make sure that is the case,
-    let's step back in time and design a backup policy.
+    In cases of filesystem crashes or hardware problems, we can assume
+    that the MySQL disk data is <emphasis>not</emphasis> available after
+    a restart. This means that MySQL fails to start successfully because
+    some blocks of disk data are no longer readable. In this case, it's
+    necessary to reformat the disk, install a new one, or otherwise
+    correct the underlying problem. Then it's necessary to recover our
+    MySQL data from backups, which means that we must already have made
+    backups. To make sure that is the case, let's step back in time and
+    design a backup policy.
    </para>
 
    <section id="backup-policy">
@@ -17333,11 +17361,11 @@
      not optimal in the sense that each successive full backup includes
      all data, even that part that didn't change since the previous full
      backup. After we have made an initial full backup, it is more
-     efficient to make incremental backups. They are smaller and take 
-     less time to produce. The tradeoff is that, at recovery time, you 
-     cannot restore your data just by reloading the full backup. You 
-     must also process the incremental backups to recover the incremental
-     changes.
+     efficient to make incremental backups. They are smaller and take
+     less time to produce. The tradeoff is that, at recovery time, you
+     cannot restore your data just by reloading the full backup. You
+     must also process the incremental backups to recover the
+     incremental changes.
     </para>
 
     <para>
@@ -17614,8 +17642,8 @@
    </itemizedlist>
 
    <para>
-    These statements can be used directly, or by means of the 
-    <command>mysqlcheck</command> client program, which provides a 
+    These statements can be used directly, or by means of the
+    <command>mysqlcheck</command> client program, which provides a
     command-line interface to them.
    </para>
 
@@ -18350,8 +18378,10 @@
      <para>
       Uses the same technique as <literal>-r</literal> and
       <literal>-n</literal>, but creates all the keys in parallel, using
-      different threads. 
+      different threads.
+
 <!--  TODO: Is this still the case in 5.0?  -->
+
       <emphasis>This is alpha code. Use at your own risk!</emphasis>
      </para></listitem>
 
@@ -18372,11 +18402,11 @@
      <para>
       Do a repair that can fix almost any problem except unique keys
       that aren't unique (which is an extremely unlikely error with
-      <literal>MyISAM</literal> tables). If you want to recover a table, 
-      this is the option to try first. You should try 
-      <literal>-o</literal> only if <command>myisamchk</command> reports 
-      that the table can't be recovered using <literal>-r</literal>. (In 
-      the unlikely case that <literal>-r</literal> fails, the data file 
+      <literal>MyISAM</literal> tables). If you want to recover a table,
+      this is the option to try first. You should try
+      <literal>-o</literal> only if <command>myisamchk</command> reports
+      that the table can't be recovered using <literal>-r</literal>. (In
+      the unlikely case that <literal>-r</literal> fails, the data file
       remains intact.)
      </para>
 
@@ -18441,11 +18471,11 @@
      <para>
       Path of the directory to be used for storing temporary files. If
       this is not set, <command>myisamchk</command> uses the value of
-      the <literal>TMPDIR</literal> environment variable. 
-      <literal>tmpdir</literal> can be set to a list of  directory paths 
-      that are used successively in round-robin fashion for creating 
-      temporary files. The separator character between directory names 
-      is the colon ('<literal>:</literal>') on Unix and the semicolon 
+      the <literal>TMPDIR</literal> environment variable.
+      <literal>tmpdir</literal> can be set to a list of directory paths
+      that are used successively in round-robin fashion for creating
+      temporary files. The separator character between directory names
+      is the colon ('<literal>:</literal>') on Unix and the semicolon
       ('<literal>;</literal>') on Windows, NetWare, and OS/2.
      </para></listitem>
 
@@ -18691,7 +18721,7 @@
     </para>
 
     <para>
-     For an explanation of how <literal>MyISAM</literal> tables can 
+     For an explanation of how <literal>MyISAM</literal> tables can
      become corrupted, see <xref linkend="myisam-table-problems"/>.
     </para>
 
@@ -18883,9 +18913,9 @@
     </para>
 
     <para>
-     You can also (and should, if possible) use the <literal>CHECK 
-     TABLE</literal> and <literal>REPAIR TABLE</literal> statements to 
-     check and repair <literal>MyISAM</literal> tables. See 
+     You can also (and should, if possible) use the <literal>CHECK
+     TABLE</literal> and <literal>REPAIR TABLE</literal> statements to
+     check and repair <literal>MyISAM</literal> tables. See
      <xref linkend="check-table"/> and <xref linkend="repair-table"/>.
     </para>
 
@@ -18957,7 +18987,7 @@
 
     <para>
      If you don't know the current table option values, use
-     <literal>SHOW CREATE TABLE</literal> or 
+     <literal>SHOW CREATE TABLE</literal> or
      <literal>DESCRIBE</literal>.
     </para>
 
@@ -19851,7 +19881,9 @@
     <listitem><para>
      <literal>Packed</literal>
     </para>
+
 <!--  TODO: Still true in 5.0? -->
+
     <para>
      MySQL strips spaces from the end of strings. The
      <literal>Packed</literal> value indicates the percentage of savings
@@ -20015,11 +20047,11 @@
    </para>
 
    <para>
-    In MySQL 5.0, you can also change the character set collation with 
-    the <literal>--default-collation</literal> option when you start the 
-    server. The collation must be a legal collation for the default 
-    character set. (Use the <literal>SHOW COLLATION</literal> statement 
-    to determine which collations are available for each character set.) 
+    In MySQL 5.0, you can also change the character set collation with
+    the <literal>--default-collation</literal> option when you start the
+    server. The collation must be a legal collation for the default
+    character set. (Use the <literal>SHOW COLLATION</literal> statement
+    to determine which collations are available for each character set.)
     See <xref linkend="configure-options"/>.
    </para>
 
@@ -20085,10 +20117,10 @@
     <title id='title-german-character-set'>&title-german-character-set;</title>
 
     <para>
-     In MySQL 5.0, character set and collation are specified
-     separately. This means that if you want German sort order, you 
-     should select the <literal>latin1</literal> character set and 
-     either the <literal>latin1_german1_ci</literal> or 
+     In MySQL 5.0, character set and collation are specified separately.
+     This means that if you want German sort order, you should select
+     the <literal>latin1</literal> character set and either the
+     <literal>latin1_german1_ci</literal> or
      <literal>latin1_german2_ci</literal> collation. For example, to
      start the server with the <literal>latin1_german1_ci</literal>
      collation, use the <literal>--character-set-server=latin1</literal>
@@ -20197,8 +20229,8 @@
    </indexterm>
 
    <para>
-    This section discusses the procedure for adding a new character set 
-    to MySQL. You must have a MySQL source distribution to use these 
+    This section discusses the procedure for adding a new character set
+    to MySQL. You must have a MySQL source distribution to use these
     instructions.
    </para>
 
@@ -20259,7 +20291,7 @@
     <itemizedlist>
 
      <listitem><para>
-      Comments start with a '<literal>#</literal>' character and 
+      Comments start with a '<literal>#</literal>' character and
       continue to the end of the line.
      </para></listitem>
 
@@ -20896,18 +20928,18 @@
    </para>
 
    <para>
-    In MySQL 5.0, you can specify where <command>mysqld</command> stores 
-    the error log file with the 
+    In MySQL 5.0, you can specify where <command>mysqld</command> stores
+    the error log file with the
     <literal>--log-error[=<replaceable>file_name</replaceable>]</literal>
     option. If no <replaceable>file_name</replaceable> value is given,
     <command>mysqld</command> uses the name
     <filename><replaceable>host_name</replaceable>.err</filename> and
-    writes the file in the data directory. If you execute <literal>FLUSH 
-    LOGS</literal>, the error log is renamed with the suffix 
-    <literal>-old</literal> and <command>mysqld</command>
-    creates a new empty log file.
+    writes the file in the data directory. If you execute <literal>FLUSH
+    LOGS</literal>, the error log is renamed with the suffix
+    <literal>-old</literal> and <command>mysqld</command> creates a new
+    empty log file.
    </para>
-   
+
    <para>
     If you don't specify <literal>--log-error</literal>, or (on Windows)
     if you use the <literal>--console</literal> option, errors are
@@ -20955,7 +20987,7 @@
     which they are executed. This is in contrast to the update log and
     the binary log, which are written after the query is executed, but
     before any locks are released. (The query log also contains all
-    statements, whereas the binary log does not contain statements that 
+    statements, whereas the binary log does not contain statements that
     only select data.)
    </para>
 
@@ -20987,28 +21019,29 @@
 
    <indexterm type="concept">
     <primary>binary log</primary>
-  </indexterm>
-  
-  <indexterm type="concept">
+   </indexterm>
+
+   <indexterm type="concept">
     <primary>files</primary>
     <secondary>binary log</secondary>
-  </indexterm>
-  
-  <indexterm type="concept">
+   </indexterm>
+
+   <indexterm type="concept">
     <primary>files</primary>
     <secondary>update log (obsolete)</secondary>
    </indexterm>
 
-   <para>The binary log contains all information that is available in 
-    the update log in a more efficient format and in a manner that is 
+   <para>
+    The binary log contains all information that is available in the
+    update log in a more efficient format and in a manner that is
     transaction-safe.
    </para>
 
    <para>
-    The binary log contains all statements which updated data or 
-    potentially could have updated it (for example, a 
-    <literal>DELETE</literal> which matched no rows). 
-    (<emphasis role="bold">Note</emphasis>: The binary log has replaced 
+    The binary log contains all statements which updated data or
+    potentially could have updated it (for example, a
+    <literal>DELETE</literal> which matched no rows).
+    (<emphasis role="bold">Note</emphasis>: The binary log has replaced
     the old update log, which is no longer available in MySQL 5.0.)
    </para>
 
@@ -21089,11 +21122,9 @@
     <xref linkend="replication-master-sql"/>.
    </para>
 
-   
    <para>
     The binary log format has some known limitations which can affect
-    recovery from backups. See
-    <xref linkend="replication-features"/>.
+    recovery from backups. See <xref linkend="replication-features"/>.
    </para>
 
    <para>
@@ -21119,9 +21150,9 @@
 
     <para>
      Observe that there is an exception to this as regards the
-     <literal>CREATE DATABASE</literal>, <literal>ALTER 
-     DATABASE</literal>, and <literal>DROP DATABASE</literal> 
-     statements, which use the database manipulated to decide if it 
+     <literal>CREATE DATABASE</literal>, <literal>ALTER
+     DATABASE</literal>, and <literal>DROP DATABASE</literal>
+     statements, which use the database manipulated to decide if it
      should log the statement rather than the current database.
     </para>
 
@@ -21155,28 +21186,27 @@
 
     <para>
      Similar to the case for <literal>--binlog-do-db</literal>, there is
-     an exception to the <literal>CREATE DATABASE</literal>, 
-     <literal>ALTER DATABASE</literal>, and <literal>DROP 
-     DATABASE</literal> statements, which use the database manipulated 
-     to decide if it should log the statement rather than the current 
+     an exception to the <literal>CREATE DATABASE</literal>,
+     <literal>ALTER DATABASE</literal>, and <literal>DROP
+     DATABASE</literal> statements, which use the database manipulated
+     to decide if it should log the statement rather than the current
      database.
     </para></listitem>
 
    </itemizedlist>
 
    <para>
-    To log or ignore multiple databases, use multiple options, 
+    To log or ignore multiple databases, use multiple options,
     specifying the appropriate option once for each database.
    </para>
 
    <para>
     The rules for logging or ignoring updates to the binary log are
     evaluated according to the following rules. Observe that there is an
-    exception for <literal>CREATE DATABASE</literal>, <literal>ALTER 
-    DATABASE</literal>, and <literal>DROP DATABASE</literal> 
-    statements. In those cases, the database being
-    <emphasis>created, altered, or dropped</emphasis> replaces the 
-    current database in the rules below.
+    exception for <literal>CREATE DATABASE</literal>, <literal>ALTER
+    DATABASE</literal>, and <literal>DROP DATABASE</literal> statements.
+    In those cases, the database being <emphasis>created, altered, or
+    dropped</emphasis> replaces the current database in the rules below.
    </para>
 
    <orderedlist>
@@ -21364,7 +21394,7 @@
    </para>
 
    <para>
-    Note that the binary log format is different in MySQL 5.0 from 
+    Note that the binary log format is different in MySQL 5.0 from
     previous versions of MySQL, due to enhancements in replication. See
     <xref linkend="replication-compatibility"/>.
    </para>
@@ -21388,13 +21418,13 @@
     operations, at restart the transaction is rolled back by
     <literal>InnoDB</literal> but still exists in the binary log. This
     problem can be solved with the
-    <literal>--innodb-safe-binlog</literal> option, which adds 
-    consistency between the content of <literal>InnoDB</literal> tables 
+    <literal>--innodb-safe-binlog</literal> option, which adds
+    consistency between the content of <literal>InnoDB</literal> tables
     and the binary log.
    </para>
 
    <para>
-    For this option to provide a greater degree of safety, the MySQL 
+    For this option to provide a greater degree of safety, the MySQL
     server should also be configured to synchronize to disk, at every
     transaction, the binary log (<literal>sync_binlog=1</literal>) and
     (which is true by default) the <literal>InnoDB</literal> logs. The
@@ -21425,7 +21455,7 @@
    </para>
 
    <para>
-    Writes to the binary log file and binary log index file are handled 
+    Writes to the binary log file and binary log index file are handled
     in the same way as writes to <literal>MyISAM</literal> tables. See
     <xref linkend="full-disk"/>.
    </para>
@@ -21477,19 +21507,19 @@
    </para>
 
    <para>
-    In MySQL 5.0's slow query log, slow queries that do not use indexes 
-    are logged as well as those that do. To prevent queries that do not 
-    use indexes from being logged in the slow query log, use the 
-    <literal>--log-short-format</literal> option. See 
+    In MySQL 5.0's slow query log, slow queries that do not use indexes
+    are logged as well as those that do. To prevent queries that do not
+    use indexes from being logged in the slow query log, use the
+    <literal>--log-short-format</literal> option. See
     <xref linkend="server-options"/>.
    </para>
 
    <para>
-     In MySQL 5.0, the <option>--log-slow-admin-statements</option> 
-     server option enables you to request logging of slow administrative 
-     statements such as <literal>OPTIMIZE TABLE</literal>, 
-     <literal>ANALYZE TABLE</literal>, and <literal>ALTER 
-     TABLE</literal> were written to the slow query.
+    In MySQL 5.0, the <option>--log-slow-admin-statements</option>
+    server option enables you to request logging of slow administrative
+    statements such as <literal>OPTIMIZE TABLE</literal>,
+    <literal>ANALYZE TABLE</literal>, and <literal>ALTER TABLE</literal>
+    were written to the slow query.
    </para>
 
    <para>
@@ -21537,14 +21567,14 @@
     <literal>mysql-log-rotate</literal> script for this. If you
     installed MySQL from an RPM distribution, the script should have
     been installed automatically. You should be careful with this script
-    if you are using the binary log for replication; do not remove 
-    binary logs until you are certain that their contents have been 
+    if you are using the binary log for replication; do not remove
+    binary logs until you are certain that their contents have been
     processed by all slaves.
    </para>
 
    <para>
     On other systems, you must install a short script yourself that you
-    start from <command>cron</command> or the equivalent for handling 
+    start from <command>cron</command> or the equivalent for handling
     log files.
    </para>
 
@@ -21725,7 +21755,7 @@
 
   <para>
    For better performance performance, you can specify the following
-   options differently for each server, in order to spread the load 
+   options differently for each server, in order to spread the load
    between physical disks:
   </para>
 
@@ -21761,8 +21791,8 @@
    servers using the same data directory and they have logging enabled,
    you must use the appropriate options to specify log filenames that
    are unique to each server. Otherwise, the servers try to log to the
-   same files. Please note that this kind of setup only works with 
-   <literal>MyISAM</literal> and <literal>MERGE</literal> tables, and 
+   same files. Please note that this kind of setup only works with
+   <literal>MyISAM</literal> and <literal>MERGE</literal> tables, and
    not with any of the other storage engines.
   </para>
 
@@ -21961,9 +21991,9 @@
     </para>
 
     <para>
-     You can also install multiple MySQL servers as services. In this 
-     case, you must make sure that each server uses a different service 
-     name in addition to all the other parameters that must be unique 
+     You can also install multiple MySQL servers as services. In this
+     case, you must make sure that each server uses a different service
+     name in addition to all the other parameters that must be unique
      for each server.
     </para>
 
@@ -22044,8 +22074,8 @@
       <command>mysqld-nt</command> using the service name
       <literal>mysqld2</literal>. In this case, you can use the
       <literal>[mysqld1]</literal> group for 4.1.8 and the
-      <literal>[mysqld2]</literal> group for 5.0.7. For example, you
-      can set up <filename>C:\my.cnf</filename> like this:
+      <literal>[mysqld2]</literal> group for 5.0.7. For example, you can
+      set up <filename>C:\my.cnf</filename> like this:
      </para>
 
 <programlisting>
@@ -22180,9 +22210,9 @@
    </para>
 
    <para>
-    Assume that an existing 4.1.8 server is configured for the default 
+    Assume that an existing 4.1.8 server is configured for the default
     TCP/IP port number (3306) and Unix socket file
-    (<filename>/tmp/mysql.sock</filename>). To configure a new 5.0.7 
+    (<filename>/tmp/mysql.sock</filename>). To configure a new 5.0.7
     server to have different operating parameters, use a
     <command>configure</command> command something like this:
    </para>
@@ -22222,7 +22252,7 @@
    <para>
     Note that if you specify <literal>localhost</literal> as a hostname,
     <command>mysqladmin</command> defaults to using a Unix socket file
-    connection rather than TCP/IP. From MySQL 4.1 onwards, you can 
+    connection rather than TCP/IP. From MySQL 4.1 onwards, you can
     explicitly specify the connection protocol to use by using the
     <literal>--protocol={TCP | SOCKET | PIPE | MEMORY}</literal> option.
    </para>
@@ -22444,11 +22474,11 @@
   </indexterm>
 
   <para>
-   MySQL 5.0 Server features a query cache. When in use, the query cache 
-   stores the text of a <literal>SELECT</literal> query together with 
-   the corresponding result that was sent to the client. If the 
-   identical query is received later, the server retrieves the results 
-   from the query cache rather than parsing and executing the query 
+   MySQL 5.0 Server features a query cache. When in use, the query cache
+   stores the text of a <literal>SELECT</literal> query together with
+   the corresponding result that was sent to the client. If the
+   identical query is received later, the server retrieves the results
+   from the query cache rather than parsing and executing the query
    again.
   </para>
 
@@ -22473,10 +22503,10 @@
   </para>
 
   <para>
-   <emphasis role="bold">Note</emphasis>: The query cache isn't used
-   for server-side prepared statements. If you're using server-side prepared 
-   statements consider that these statement won't be satisfied by the query
-   cache. See <xref linkend="c-api-prepared-statements"/>.
+   <emphasis role="bold">Note</emphasis>: The query cache isn't used for
+   server-side prepared statements. If you're using server-side prepared
+   statements consider that these statement won't be satisfied by the
+   query cache. See <xref linkend="c-api-prepared-statements"/>.
   </para>
 
   <para>
@@ -22534,18 +22564,18 @@
 </programlisting>
 
    <para>
-    Queries must be <emphasis>exactly</emphasis> the same (byte for 
-    byte) to be seen as identical. In addition, query strings that are 
-    identical may be treated as different for other reasons. Queries 
-    that use different databases, different protocol versions, or 
-    different default character sets are considered different queries 
+    Queries must be <emphasis>exactly</emphasis> the same (byte for
+    byte) to be seen as identical. In addition, query strings that are
+    identical may be treated as different for other reasons. Queries
+    that use different databases, different protocol versions, or
+    different default character sets are considered different queries
     and are cached separately.
    </para>
 
    <para>
     Before a query is fetched from the query cache, MySQL checks that
-    the user has <literal>SELECT</literal> privilege for all databases 
-    and tables involved. If this is not the case, the cached result is 
+    the user has <literal>SELECT</literal> privilege for all databases
+    and tables involved. If this is not the case, the cached result is
     not used.
    </para>
 
@@ -22555,11 +22585,11 @@
     <literal>Com_select</literal>. See
     <xref linkend="query-cache-status-and-maintenance"/>.
    </para>
-   
+
    <para>
-    If a table changes, then all cached queries using that table become 
-    invalid and are removed from the cache. This includes queries that 
-    use <literal>MERGE</literal> tables that map to the changed table. A 
+    If a table changes, then all cached queries using that table become
+    invalid and are removed from the cache. This includes queries that
+    use <literal>MERGE</literal> tables that map to the changed table. A
     table can be changed by many types of statements, such as
     <literal>INSERT</literal>, <literal>UPDATE</literal>,
     <literal>DELETE</literal>, <literal>TRUNCATE</literal>,
@@ -22574,21 +22604,23 @@
    </para>
 
    <para>
-    In MySQL 5.0, the query cache also works within transactions when 
-    using <literal>InnoDB</literal> tables, making use of the table 
-    version number to detect whether or not its contents are still 
+    In MySQL 5.0, the query cache also works within transactions when
+    using <literal>InnoDB</literal> tables, making use of the table
+    version number to detect whether or not its contents are still
     current.
    </para>
-   
+
    <para>
-     In MySQL 5.0, queries generated by views are cached. An issue with
-     results in the query cache generated from a view not being properly
-     invalidated after some operations on that view was resolved in 
-     MySQL 5.0.3. See <xref linkend="news-5-0-3"/>.
+    In MySQL 5.0, queries generated by views are cached. An issue with
+    results in the query cache generated from a view not being properly
+    invalidated after some operations on that view was resolved in MySQL
+    5.0.3. See <xref linkend="news-5-0-3"/>.
    </para>
+
 <!--  TODO: Need xref to news-5-0-x? -->
+
    <para>
-    Before MySQL 5.0, a query that began with a leading comment could be 
+    Before MySQL 5.0, a query that began with a leading comment could be
     cached, but could not be fetched from the cache. This problem is
     fixed in MySQL 5.0.
    </para>
@@ -22703,7 +22735,9 @@
     <listitem><para>
      It refers to user variables.
     </para></listitem>
+
 <!--  TODO: What about INFRORMATION_SCHEMA? -->
+
     <listitem><para>
      It refers to the tables in the <literal>mysql</literal> system
      database.
@@ -22827,10 +22861,10 @@
 +------------------+-------+
 </programlisting>
 
-    <para>
-      When using a standard MySQL 5.0 binary, this value is always 
-      <literal>YES</literal>, even if query caching is disabled.
-    </para>
+   <para>
+    When using a standard MySQL 5.0 binary, this value is always
+    <literal>YES</literal>, even if query caching is disabled.
+   </para>
 
    <para>
     Several other system variables control query cache operation. These
@@ -23040,18 +23074,18 @@
    </para>
 
    <para>
-    The information provided by the 
-    <literal>Qcache_lowmem_prunes</literal> status variable can be used 
-    to help you tune the query cache size. It counts the number of 
-    queries that have been removed from the cache to free up memory for 
-    caching new queries. The query cache uses a least recently used 
-    (LRU) strategy to decide which queries to remove from the cache. 
-    Tuning information is given in 
+    The information provided by the
+    <literal>Qcache_lowmem_prunes</literal> status variable can be used
+    to help you tune the query cache size. It counts the number of
+    queries that have been removed from the cache to free up memory for
+    caching new queries. The query cache uses a least recently used
+    (LRU) strategy to decide which queries to remove from the cache.
+    Tuning information is given in
     <xref linkend="query-cache-configuration"/>.
    </para>
 
   </section>
- 
-</section>
+
+ </section>
 
 </chapter>

--- 1.39/refman-5.0/news.xml	2005-07-07 20:47:46 -05:00
+++ 1.40/refman-5.0/news.xml	2005-07-07 21:01:59 -05:00
@@ -26,18 +26,18 @@
  </indexterm>
 
  <para>
-  This appendix lists the changes in the MySQL source code for version 
-  5.0.0 and later releases. For information about changes in previous 
-  versions of the MySQL database software, see the 
-  <citetitle>&title-refman-previous;</citetitle>, which provides coverage of 
-  the 3.22, 3.23, 4.0, and 4.1 series of releases.
+  This appendix lists the changes in the MySQL source code for version
+  5.0.0 and later releases. For information about changes in previous
+  versions of the MySQL database software, see the
+  <citetitle>&title-refman-previous;</citetitle>, which provides
+  coverage of the 3.22, 3.23, 4.0, and 4.1 series of releases.
  </para>
 
  <para>
   We are working actively on MySQL 5.0 and 5.1, and now provide only
-  critical bugfixes for MySQL 4.1, 4.0, and MySQL 3.23. We update this 
-  section as we add new features, so that everybody can follow the 
-  development. 
+  critical bugfixes for MySQL 4.1, 4.0, and MySQL 3.23. We update this
+  section as we add new features, so that everybody can follow the
+  development.
  </para>
 
  <para>
@@ -211,196 +211,172 @@
   </para>
 
   <section id="news-5-0-10">
-    
-    <title id="title-news-5-0-10">&title-news-5-0-10;</title>
-    
-    <para>
-      Functionality added or changed:
-    </para>
-    
-    <itemizedlist>
-      
-      <listitem>
-        <para>
-        </para>
-      </listitem>
-      
-    </itemizedlist>
-    
-    <para>
-      Bugs fixed:
-    </para>
-    
-    <itemizedlist>
-      
-      <listitem>
-        <para>
-          In a shared Windows environment, MySQL could not find its 
-          configuration file unless the file was in the 
-          <filename>C:\</filename> directory. (Bug #5354)
-        </para>
-      </listitem>
-      
-    </itemizedlist>
-    
+
+   <title id="title-news-5-0-10">&title-news-5-0-10;</title>
+
+   <para>
+    Functionality added or changed:
+   </para>
+
+   <itemizedlist>
+
+    <listitem><para></para></listitem>
+
+   </itemizedlist>
+
+   <para>
+    Bugs fixed:
+   </para>
+
+   <itemizedlist>
+
+    <listitem><para>
+     In a shared Windows environment, MySQL could not find its
+     configuration file unless the file was in the
+     <filename>C:\</filename> directory. (Bug #5354)
+    </para></listitem>
+
+   </itemizedlist>
+
   </section>
 
   <section id="news-5-0-9">
 
-    <title id="title-news-5-0-9">&title-news-5-0-9;</title>
-  
-    <para>
-      Functionality added or changed:
-    </para>
-  
-    <itemizedlist>
-      
-      <listitem>
-        <para>
-          <literal>InnoDB</literal>: When creating or extending an 
-          InnoDB data file, at most one megabyte at a time is allocated 
-          for initializing the file. Previously, InnoDB allocated and 
-          initialized 1 or 8 megabytes of memory, even if only a few 
-          16-kilobyte pages were to be written. This improves the 
-          performance of <literal>CREATE TABLE</literal> in 
-          <literal>innodb_file_per_table</literal> mode.
-        </para>
-      </listitem>
-      
-      <listitem>
-        <para>
-          Recursion in stored routines is now disabled because it was 
-          crashing the server. We plan to modify stored routines to 
-          allow this to operate safely in a future release. (Bug #11394)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          The handling of <literal>BIT</literal> columns has been 
-          improved, and should now be much more reliable in a number of 
-          cases. (Bug #10617, Bug #11091, Bug #11572)
-        </para>
-      </listitem>
-    
-    </itemizedlist>
-  
-    <para>
-      Bugs fixed:
-    </para>
+   <title id="title-news-5-0-9">&title-news-5-0-9;</title>
 
-    <itemizedlist>      
+   <para>
+    Functionality added or changed:
+   </para>
 
-      <listitem>
-        <para>
-          In strict mode, an <literal>INSERT</literal> into a view that 
-          did not include a value for a <literal>NOT NULL</literal> 
-          column but that did include a <literal>WHERE</literal> test on 
-          the same column would succeed, This happened even though the 
-          <literal>INSERT</literal> should have been prevented due to the
-          failure to supply a value for the <literal>NOT NULL</literal> 
-          column. (Bug #6443)
-        </para>
-      </listitem>
-            
-      <listitem>
-        <para>
-          When a table had a primary key containing a 
-          <literal>BLOB</literal> column, creation of another index 
-          failed with the error <literal>BLOB/TEXT column used in key 
-          specification without keylength</literal>, even when the new 
-          index did not contain a <literal>BLOB</literal> column. (Bug 
-          #11657)
-        </para>
-      </listitem>
-
-      <listitem>
-        <para>
-          Running a <literal>CHECK TABLES</literal> on multiple views 
-          crashed the server. (Bug #11337)
-        </para>
-     </listitem>
-      
-      <listitem>
-        <para>
-          NDB Cluster: When trying to open a table that could not be 
-          discovered or unpacked, cluster would return error codes which 
-          the MySQL server falsely interpreted as operating system errors. 
-          (Bug #103651)
-        </para>
-      </listitem>
-      
-      <listitem>
-        <para>
-          Manually inserting a row with <literal>host=''</literal> into 
-          <literal>mysql.tables_priv</literal> and performing a 
-          <literal>FLUSH PRIVILEGES</literal> would cause the server to 
-          crash. (Bug #11330)
-        </para>
-      </listitem>
-      
-      <listitem>
-        <para>A cursor using a query with a filter on a 
-          <literal>DATE</literal> or <literal>DATETIME</literal> column 
-          would cause the server to crash server after the data was 
-          fetched. (Bug #11172)</para>
-      </listitem>
-      
-      <listitem><para>
-          Closing a cursor that was already closed would cause MySQL to 
-          hang. (Bug #9814)
-        </para></listitem>
-      
-      <listitem><para>
-          Using <literal>CONCAT_WS</literal> on a column set <literal>NOT
-            NULL</literal> caused incorrect results when used in a
-          <literal>LEFT JOIN</literal>. (Bug #11469)
-        </para></listitem>
-      
-      <listitem><para>
-          Signed <literal>BIGINT</literal> would not accept
-          <literal>-9223372036854775808</literal> as a
-          <literal>DEFAULT</literal> value. (Bug #11215)
-        </para></listitem>
-      
-      <listitem><para>
-          Views did not use indexes on all appropriate queries. (Bug #10031)
+   <itemizedlist>
+
+    <listitem><para>
+     <literal>InnoDB</literal>: When creating or extending an InnoDB
+     data file, at most one megabyte at a time is allocated for
+     initializing the file. Previously, InnoDB allocated and initialized
+     1 or 8 megabytes of memory, even if only a few 16-kilobyte pages
+     were to be written. This improves the performance of
+     <literal>CREATE TABLE</literal> in
+     <literal>innodb_file_per_table</literal> mode.
     </para></listitem>
-      
-      <listitem>
-        <para>For <literal>MEMORY</literal> tables, it was possible for 
-        for updates to be performed using outdated key statistics when 
-        the updates involved only very small changes in a very few rows. 
-        This resulted in the random failures of queries such as 
-        <literal>UPDATE t SET col = col + 1 WHERE col_key = 2;</literal> 
-        where the same query with no <literal>WHERE</literal> clause 
-        would succeed. (Bug #10178)</para>
-      </listitem>
-     
 
-      <listitem><para>
-      Optimizer performed range check when comparing unsigned integers to
-      negative constants, could cause errors. (Bug #11185)
-      </para></listitem>
-  
-      <listitem><para>
-      Wrong comparison method used in <literal>VIEW</literal> when
-      relaxed date syntax used (i.e. <literal>2005.06.10</literal>). (Bug
-      #11325)
-      </para></listitem>
-  
-      <listitem><para>
-      The <literal>ENCRYPT()</literal> and
-      <literal>SUBSTRING_INDEX()</literal> functions would cause errors
-      when used with a <literal>VIEW</literal>. (Bug #7024)
-      </para></listitem>
-  
-      <listitem><para>
-      Clients would hang following some errors with stored procedures.
-      (Bug #9503)
-      </para></listitem>
+    <listitem><para>
+     Recursion in stored routines is now disabled because it was
+     crashing the server. We plan to modify stored routines to allow
+     this to operate safely in a future release. (Bug #11394)
+    </para></listitem>
 
-    </itemizedlist>
+    <listitem><para>
+     The handling of <literal>BIT</literal> columns has been improved,
+     and should now be much more reliable in a number of cases. (Bug
+     #10617, Bug #11091, Bug #11572)
+    </para></listitem>
+
+   </itemizedlist>
+
+   <para>
+    Bugs fixed:
+   </para>
+
+   <itemizedlist>
+
+    <listitem><para>
+     In strict mode, an <literal>INSERT</literal> into a view that did
+     not include a value for a <literal>NOT NULL</literal> column but
+     that did include a <literal>WHERE</literal> test on the same column
+     would succeed, This happened even though the
+     <literal>INSERT</literal> should have been prevented due to the
+     failure to supply a value for the <literal>NOT NULL</literal>
+     column. (Bug #6443)
+    </para></listitem>
+
+    <listitem><para>
+     When a table had a primary key containing a <literal>BLOB</literal>
+     column, creation of another index failed with the error
+     <literal>BLOB/TEXT column used in key specification without
+     keylength</literal>, even when the new index did not contain a
+     <literal>BLOB</literal> column. (Bug #11657)
+    </para></listitem>
+
+    <listitem><para>
+     Running a <literal>CHECK TABLES</literal> on multiple views crashed
+     the server. (Bug #11337)
+    </para></listitem>
+
+    <listitem><para>
+     NDB Cluster: When trying to open a table that could not be
+     discovered or unpacked, cluster would return error codes which the
+     MySQL server falsely interpreted as operating system errors. (Bug
+     #103651)
+    </para></listitem>
+
+    <listitem><para>
+     Manually inserting a row with <literal>host=''</literal> into
+     <literal>mysql.tables_priv</literal> and performing a
+     <literal>FLUSH PRIVILEGES</literal> would cause the server to
+     crash. (Bug #11330)
+    </para></listitem>
+
+    <listitem><para>
+     A cursor using a query with a filter on a <literal>DATE</literal>
+     or <literal>DATETIME</literal> column would cause the server to
+     crash server after the data was fetched. (Bug #11172)
+    </para></listitem>
+
+    <listitem><para>
+     Closing a cursor that was already closed would cause MySQL to hang.
+     (Bug #9814)
+    </para></listitem>
+
+    <listitem><para>
+     Using <literal>CONCAT_WS</literal> on a column set <literal>NOT
+     NULL</literal> caused incorrect results when used in a
+     <literal>LEFT JOIN</literal>. (Bug #11469)
+    </para></listitem>
+
+    <listitem><para>
+     Signed <literal>BIGINT</literal> would not accept
+     <literal>-9223372036854775808</literal> as a
+     <literal>DEFAULT</literal> value. (Bug #11215)
+    </para></listitem>
+
+    <listitem><para>
+     Views did not use indexes on all appropriate queries. (Bug #10031)
+    </para></listitem>
+
+    <listitem><para>
+     For <literal>MEMORY</literal> tables, it was possible for for
+     updates to be performed using outdated key statistics when the
+     updates involved only very small changes in a very few rows. This
+     resulted in the random failures of queries such as <literal>UPDATE
+     t SET col = col + 1 WHERE col_key = 2;</literal> where the same
+     query with no <literal>WHERE</literal> clause would succeed. (Bug
+     #10178)
+    </para></listitem>
+
+    <listitem><para>
+     Optimizer performed range check when comparing unsigned integers to
+     negative constants, could cause errors. (Bug #11185)
+    </para></listitem>
+
+    <listitem><para>
+     Wrong comparison method used in <literal>VIEW</literal> when
+     relaxed date syntax used (i.e. <literal>2005.06.10</literal>). (Bug
+     #11325)
+    </para></listitem>
+
+    <listitem><para>
+     The <literal>ENCRYPT()</literal> and
+     <literal>SUBSTRING_INDEX()</literal> functions would cause errors
+     when used with a <literal>VIEW</literal>. (Bug #7024)
+    </para></listitem>
+
+    <listitem><para>
+     Clients would hang following some errors with stored procedures.
+     (Bug #9503)
+    </para></listitem>
+
+   </itemizedlist>
 
   </section>
 
@@ -1362,20 +1338,20 @@
      MySQL 5.0.3 to 5.0.5.) (Bug #10465, Bug #10625)
     </para></listitem>
 
-  <listitem><para>
-   Added the <literal>log_bin_trust_routine_creators</literal> system
-   variable, which applies when binary logging is enabled. It controls
-   whether stored routine creators can be trusted not to create stored
-   routines that will cause unsafe events to be written to the binary
-   log.
-  </para></listitem>
-
-  <listitem><para>
-   Added the <option>--log-bin-trust-routine-creators</option> server
-   option for setting the
-   <literal>log_bin_trust_routine_creators</literal> system variable
-   from the command line.
-  </para></listitem>
+    <listitem><para>
+     Added the <literal>log_bin_trust_routine_creators</literal> system
+     variable, which applies when binary logging is enabled. It controls
+     whether stored routine creators can be trusted not to create stored
+     routines that will cause unsafe events to be written to the binary
+     log.
+    </para></listitem>
+
+    <listitem><para>
+     Added the <option>--log-bin-trust-routine-creators</option> server
+     option for setting the
+     <literal>log_bin_trust_routine_creators</literal> system variable
+     from the command line.
+    </para></listitem>
 
     <listitem><para>
      Implemented the <literal>STMT_ATTR_PREFETCH_ROWS</literal> option
@@ -2964,8 +2940,8 @@
     </para></listitem>
 
     <listitem><para>
-     InnoDB: Relaxed locking in <literal>INSERT…SELECT</literal>, single
-     table <literal>UPDATE…SELECT</literal> and single table
+     InnoDB: Relaxed locking in <literal>INSERT…SELECT</literal>,
+     single table <literal>UPDATE…SELECT</literal> and single table
      <literal>DELETE…SELECT</literal> clauses when
      <literal>innodb_locks_unsafe_for_binlog</literal> is used and
      isolation level of the transaction is not serializable.
@@ -4562,7 +4538,6 @@
   </section>
 
   <section id="news-5-0-0">
-    
 
    <title id='title-news-5-0-0'>&title-news-5-0-0;</title>
 
@@ -4649,33 +4624,33 @@
 
   </section>
 
-  <!--  TODO: Consolidate innodb-news-5-0-0 with news-5-0-0 -->
+<!--  TODO: Consolidate innodb-news-5-0-0 with news-5-0-0 -->
+
   <section id="innodb-news-5-0-0">
-    
-    <title id='title-innodb-news-5-0-0'>&title-innodb-news-5-0-0;</title>
-    
-    <itemizedlist>
-      
-      <listitem><para>
-          <emphasis role="bold">Important note:</emphasis> If you upgrade to
-          MySQL 4.1.1 or higher, it is difficult to downgrade back to 4.0 or
-          4.1.0! That is because, for earlier versions,
-          <literal>InnoDB</literal> is not aware of multiple tablespaces.
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>InnoDB</literal> in 5.0.0 is essentially the same as
-          InnoDB-4.1.1 with the bugfixes of InnoDB-4.0.17 included.
-        </para></listitem>
-      
-    </itemizedlist>
-    
-  </section>
 
-</section>
+   <title id='title-innodb-news-5-0-0'>&title-innodb-news-5-0-0;</title>
+
+   <itemizedlist>
+
+    <listitem><para>
+     <emphasis role="bold">Important note:</emphasis> If you upgrade to
+     MySQL 4.1.1 or higher, it is difficult to downgrade back to 4.0 or
+     4.1.0! That is because, for earlier versions,
+     <literal>InnoDB</literal> is not aware of multiple tablespaces.
+    </para></listitem>
+
+    <listitem><para>
+     <literal>InnoDB</literal> in 5.0.0 is essentially the same as
+     InnoDB-4.1.1 with the bugfixes of InnoDB-4.0.17 included.
+    </para></listitem>
+
+   </itemizedlist>
+
+  </section>
 
+ </section>
 
-  <!--  TODO: Merge mysql-cluster-change-history with news-5-0-x  -->
+<!--  TODO: Merge mysql-cluster-change-history with news-5-0-x  -->
 
  <section id="mysql-cluster-change-history">
 

--- 1.9/refman/installing.xml	2005-07-07 20:57:21 -05:00
+++ 1.10/refman/installing.xml	2005-07-07 21:01:59 -05:00
@@ -7657,54 +7657,66 @@
      <ulink url="http://www.bitmover.com/bk-client.shar">http://www.bitmover.com/bk-client.shar</ulink>.
     </para></listitem>
 
-    <listitem>
-     <para>
-      On Unix, install the free client like this:
-      <programlisting>
+    <listitem><para>
+     On Unix, install the free client like this:
+
+<programlisting>
 shell&gt; sh bk-client.shar
 shell&gt; cd bk_client-1.1
 shell&gt; make all
 shell&gt; PATH=$PWD:$PATH
       </programlisting>
-     </para>
-     <para>
-      On Windows, install it like this:
-      <itemizedlist>
-       <listitem><para>
-        Download and install Cygwin from 
-        <ulink url="http://cygwin.com/">http://cygwin.com</ulink>.
-       </para></listitem>
-       <listitem><para>
-        Make sure <literal>gcc</literal> has been installed under Cygwin.
-        You can test this by issuing <literal>which gcc</literal>. If it's not
-        installed, run Cygwin's package manager, select <literal>gcc</literal>,
-        and install it.
-       </para></listitem>
-       <listitem><para>
-        Under Cygwin, perform these steps:
-        <programlisting>
+    </para>
+
+    <para>
+     On Windows, install it like this:
+
+     <itemizedlist>
+
+      <listitem><para>
+       Download and install Cygwin from
+       <ulink url="http://cygwin.com/">http://cygwin.com</ulink>.
+      </para></listitem>
+
+      <listitem><para>
+       Make sure <literal>gcc</literal> has been installed under Cygwin.
+       You can test this by issuing <literal>which gcc</literal>. If
+       it's not installed, run Cygwin's package manager, select
+       <literal>gcc</literal>, and install it.
+      </para></listitem>
+
+      <listitem><para>
+       Under Cygwin, perform these steps:
+
+<programlisting>
 shell&gt; sh bk-client.shar
 shell&gt; cd bk_client-1.1
         </programlisting>
-        Then edit the <filename>Makefile</filename> and change the line that
-        reads <literal>$(CC) $(CFLAGS) -o sfio -lz sfio.c</literal> to this:
-        <programlisting>
+
+       Then edit the <filename>Makefile</filename> and change the line
+       that reads <literal>$(CC) $(CFLAGS) -o sfio -lz sfio.c</literal>
+       to this:
+
+<programlisting>
 $(CC) $(CFLAGS) -o sfio sfio.c -lz
         </programlisting>
-        Now run the <command>make</command> command and set the path:
-        <programlisting>
+
+       Now run the <command>make</command> command and set the path:
+
+<programlisting>
 shell&gt; make all
 shell&gt; PATH=$PWD:$PATH
         </programlisting>
-       </para></listitem>
-      </itemizedlist>
-     </para>
-    </listitem>
+      </para></listitem>
+
+     </itemizedlist>
+    </para></listitem>
 
     <listitem><para>
-     After the BitKeeper free client has been installed, first go to the 
-     directory you want to work from, and then use one of the following commands 
-     to make a local copy of the MySQL version branch of your choice:
+     After the BitKeeper free client has been installed, first go to the
+     directory you want to work from, and then use one of the following
+     commands to make a local copy of the MySQL version branch of your
+     choice:
     </para>
 
     <para>
@@ -7741,13 +7753,13 @@
 
     <para>
      Normally, you don't have to build the documentation yourself,
-     because we're providing it in various formats on 
+     because we're providing it in various formats on
      <ulink url="http://dev.mysql.com/doc/">http://dev.mysql.com/doc</ulink>.
-     The formats you can download there (HTML, PDF, etc.) are being built on
-     a daily basis, so you gain little by creating them yourself from the
-     DocBook XML base format in the <literal>mysqldoc</literal> tree.
-     If you would like to copy the documentation repository, anyway,
-     use the following command:
+     The formats you can download there (HTML, PDF, etc.) are being
+     built on a daily basis, so you gain little by creating them
+     yourself from the DocBook XML base format in the
+     <literal>mysqldoc</literal> tree. If you would like to copy the
+     documentation repository, anyway, use the following command:
     </para>
 
 <programlisting>
@@ -7767,9 +7779,10 @@
     </para></listitem>
 
     <listitem><para>
-     To update the local copy of a repository, use this command (the example
-     is for updating the 5.0 branch):
-     <programlisting>
+     To update the local copy of a repository, use this command (the
+     example is for updating the 5.0 branch):
+
+<programlisting>
 shell&gt; update bk://mysql.bkbits.net/mysql-5.0 mysql-5.0
      </programlisting>
     </para></listitem>
@@ -7927,29 +7940,31 @@
     </para></listitem>
 
     <listitem><para>
-     After the initial copying of the repository (<literal>sfioball</literal>)
-     to obtain the source tree, you should update the repository 
-     (<literal>update</literal>) periodically to get updates.
+     After the initial copying of the repository
+     (<literal>sfioball</literal>) to obtain the source tree, you should
+     update the repository (<literal>update</literal>) periodically to
+     get updates.
     </para></listitem>
 
     <listitem><para>
      You can examine the change history for the tree with all the diffs
      by viewing the <filename>BK/ChangeLog</filename> file in the source
-     tree and looking at the <literal>ChangeSet</literal> descriptions listed 
-     there. To examine a particular changeset, you would have to use the 
-     <command>sfioball</command> command to  extract two particular revisions 
-     of the source tree, then use an  external <command>diff</command> command 
-     to compare them. If you see some funny diffs
-     or code that you have a question about, do not hesitate to send
-     email to the MySQL <literal>internals</literal> mailing list. See
-     <xref linkend="mailing-list"/>. Also, if you think you have a
-     better idea on how to do something, send an email message to the
-     same address with a patch.
+     tree and looking at the <literal>ChangeSet</literal> descriptions
+     listed there. To examine a particular changeset, you would have to
+     use the <command>sfioball</command> command to extract two
+     particular revisions of the source tree, then use an external
+     <command>diff</command> command to compare them. If you see some
+     funny diffs or code that you have a question about, do not hesitate
+     to send email to the MySQL <literal>internals</literal> mailing
+     list. See <xref linkend="mailing-list"/>. Also, if you think you
+     have a better idea on how to do something, send an email message to
+     the same address with a patch.
     </para></listitem>
 
     <listitem><para>
      The BitKeeper free client is shipped with its source code. The only
-     documentation available for the free client is the source code itself.
+     documentation available for the free client is the source code
+     itself.
     </para></listitem>
 
    </orderedlist>
@@ -8700,8 +8715,8 @@
      </para></listitem>
 
      <listitem><para>
-      BitKeeper 3.0 installed on that system.
-      See <xref linkend="installing-source-tree"/> for instructions how to
+      BitKeeper 3.0 installed on that system. See
+      <xref linkend="installing-source-tree"/> for instructions how to
       download and install BitKeeper.
      </para></listitem>
 
@@ -8943,9 +8958,9 @@
     <orderedlist>
 
      <listitem><para>
-      Copy the BitKeeper source tree for MySQL (version 4.1 or above,
-      as desired). For more information on how To copy the source tree,
-      see the instructions at <xref linkend="installing-source-tree"/>.
+      Copy the BitKeeper source tree for MySQL (version 4.1 or above, as
+      desired). For more information on how To copy the source tree, see
+      the instructions at <xref linkend="installing-source-tree"/>.
      </para></listitem>
 
      <listitem><para>
@@ -11319,10 +11334,10 @@
     </para></listitem>
 
     <listitem><para>
-  In MySQL 5.0.6, binary logging of stored routines and triggers was
-  changed. This change has implications for security, replication, and
-  data recovery, as discussed in
-  <xref linkend="stored-procedure-logging"/>.
+     In MySQL 5.0.6, binary logging of stored routines and triggers was
+     changed. This change has implications for security, replication,
+     and data recovery, as discussed in
+     <xref linkend="stored-procedure-logging"/>.
     </para></listitem>
 
    </itemizedlist>
@@ -12844,8 +12859,8 @@
     <listitem><para>
      <literal>AUTO_INCREMENT</literal> columns should not be used to
      store negative numbers. The reason for this is that negative
-     numbers caused problems when wrapping from -1 to 0. You should
-     not store 0 in <literal>AUTO_INCREMENT</literal> columns, either;
+     numbers caused problems when wrapping from -1 to 0. You should not
+     store 0 in <literal>AUTO_INCREMENT</literal> columns, either;
      <literal>CHECK TABLE</literal> complains about 0 values because
      they may change if you dump and restore the table.
      <literal>AUTO_INCREMENT</literal> for <literal>MyISAM</literal>

--- 1.16/refman/mysql-database-administration.xml	2005-07-07 20:56:41 -05:00
+++ 1.17/refman/mysql-database-administration.xml	2005-07-07 21:01:59 -05:00
@@ -37,210 +37,210 @@
    configuring the server itself is given in
    <xref linkend="configuring-mysql"/>.
   </para>
-  
+
   <section id="server-side-overview">
-    
-    <title id='title-server-side-overview'>&title-server-side-overview;</title>
-    
+
+   <title id='title-server-side-overview'>&title-server-side-overview;</title>
+
+   <indexterm type="concept">
+    <primary>programs</primary>
+    <secondary>list of</secondary>
+   </indexterm>
+
+   <para>
+    All MySQL programs take many different options. However, every MySQL
+    program provides a <literal>--help</literal> option that you can use
+    to get a description of the program's options. For example, try
+    <command>mysqld --help</command>.
+   </para>
+
+   <para>
+    You can override default options for all standard programs by
+    specifying options on the command line or in an option file.
+    <xref linkend="program-options"/>.
+   </para>
+
+   <para>
+    The following list briefly describes the MySQL server and
+    server-related programs:
+   </para>
+
+   <itemizedlist>
+
     <indexterm type="concept">
-      <primary>programs</primary>
-      <secondary>list of</secondary>
+     <primary><command>mysqld</command></primary>
     </indexterm>
-    
+
+    <listitem><para>
+     <literal>mysqld</literal>
+    </para>
+
     <para>
-      All MySQL programs take many different options. However, every MySQL
-      program provides a <literal>--help</literal> option that you can use
-      to get a description of the program's options. For example, try
-      <command>mysqld --help</command>.
+     The SQL daemon (that is, the MySQL server). To use client programs,
+     this program must be running, because clients gain access to
+     databases by connecting to the server. See
+     <xref linkend="configuring-mysql"/>.
     </para>
-    
+
     <para>
-      You can override default options for all standard programs by
-      specifying options on the command line or in an option file.
-      <xref linkend="program-options"/>.
+     <indexterm type="concept">
+      <primary><command>mysqld-max</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysqld-max</literal>
     </para>
-    
+
     <para>
-      The following list briefly describes the MySQL server and
-      server-related programs:
+     A version of the server that includes additional features. See
+     <xref linkend="mysqld-max"/>.
     </para>
-    
-    <itemizedlist>
-      
-      <indexterm type="concept">
-        <primary><command>mysqld</command></primary>
-      </indexterm>
-      
-      <listitem><para>
-          <literal>mysqld</literal>
-        </para>
-        
-        <para>
-          The SQL daemon (that is, the MySQL server). To use client programs,
-          this program must be running, because clients gain access to
-          databases by connecting to the server. See
-          <xref linkend="configuring-mysql"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysqld-max</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysqld-max</literal>
-        </para>
-        
-        <para>
-          A version of the server that includes additional features. See
-          <xref linkend="mysqld-max"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysqld_safe</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysqld_safe</literal>
-        </para>
-        
-        <para>
-          A server startup script. <command>mysqld_safe</command> attempts to
-          start <command>mysqld-max</command> if it exists, and
-          <command>mysqld</command> otherwise. See
-          <xref linkend="mysqld-safe"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysql.server</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysql.server</literal>
-        </para>
-        
-        <para>
-          A server startup script. This script is used on systems that use
-          run directories containing scripts that start system services for
-          particular run levels. It invokes <command>mysqld_safe</command> to
-          start the MySQL server. See <xref linkend="mysql-server"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysqld_multi</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysqld_multi</literal>
-        </para>
-        
-        <para>
-          A server startup script that can start or stop multiple servers
-          installed on the system. See <xref linkend="mysqld-multi"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysql_install_db</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysql_install_db</literal>
-        </para>
-        
-        <para>
-          This script creates the MySQL grant tables with default privileges.
-          It is usually executed only once, when first installing MySQL on a
-          system. See <xref linkend="unix-post-installation"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysql_fix_privilege_tables</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysql_fix_privilege_tables</literal>
-        </para>
-        
-        <para>
-          This script is used after an upgrade install operation, to update
-          the grant tables with any changes that have been made in newer
-          versions of MySQL. See <xref linkend="upgrading-grant-tables"/>.
-        </para></listitem>
-      
-    </itemizedlist>
-    
+
     <para>
-      There are several other programs that also are run on the server
-      host:
+     <indexterm type="concept">
+      <primary><command>mysqld_safe</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysqld_safe</literal>
     </para>
-    
-    <!--  TODO: indicate where these are discussed -->
-    
-    <itemizedlist>
-      
-      <indexterm type="concept">
-        <primary><command>myisamchk</command></primary>
-      </indexterm>
-      
-      <listitem><para>
-          <literal>myisamchk</literal>
-        </para>
-        
-        <para>
-          A utility to describe, check, optimize, and repair
-          <literal>MyISAM</literal> tables. <command>myisamchk</command> is
-          described in <xref linkend="table-maintenance"/>.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>make_binary_distribution</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>make_binary_distribution</literal>
-        </para>
-        
-        <para>
-          This program makes a binary release of a compiled MySQL. This could
-          be sent by FTP to <filename>/pub/mysql/upload/</filename> on
-          <literal>ftp.mysql.com</literal> for the convenience of other MySQL
-          users.
-        </para>
-        
-        <para>
-          <indexterm type="concept">
-            <primary><command>mysqlbug</command></primary>
-          </indexterm>
-        </para></listitem>
-      
-      <listitem><para>
-          <literal>mysqlbug</literal>
-        </para>
-        
-        <para>
-          The MySQL bug reporting script. It can be used to send a bug report
-          to the MySQL mailing list. (You can also visit
-          <ulink url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>
-          to file a bug report online. See <xref linkend="bug-reports"/>.)
-        </para></listitem>
-      
-    </itemizedlist>
-    
+
+    <para>
+     A server startup script. <command>mysqld_safe</command> attempts to
+     start <command>mysqld-max</command> if it exists, and
+     <command>mysqld</command> otherwise. See
+     <xref linkend="mysqld-safe"/>.
+    </para>
+
+    <para>
+     <indexterm type="concept">
+      <primary><command>mysql.server</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysql.server</literal>
+    </para>
+
+    <para>
+     A server startup script. This script is used on systems that use
+     run directories containing scripts that start system services for
+     particular run levels. It invokes <command>mysqld_safe</command> to
+     start the MySQL server. See <xref linkend="mysql-server"/>.
+    </para>
+
+    <para>
+     <indexterm type="concept">
+      <primary><command>mysqld_multi</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysqld_multi</literal>
+    </para>
+
+    <para>
+     A server startup script that can start or stop multiple servers
+     installed on the system. See <xref linkend="mysqld-multi"/>.
+    </para>
+
+    <para>
+     <indexterm type="concept">
+      <primary><command>mysql_install_db</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysql_install_db</literal>
+    </para>
+
+    <para>
+     This script creates the MySQL grant tables with default privileges.
+     It is usually executed only once, when first installing MySQL on a
+     system. See <xref linkend="unix-post-installation"/>.
+    </para>
+
+    <para>
+     <indexterm type="concept">
+      <primary><command>mysql_fix_privilege_tables</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysql_fix_privilege_tables</literal>
+    </para>
+
+    <para>
+     This script is used after an upgrade install operation, to update
+     the grant tables with any changes that have been made in newer
+     versions of MySQL. See <xref linkend="upgrading-grant-tables"/>.
+    </para></listitem>
+
+   </itemizedlist>
+
+   <para>
+    There are several other programs that also are run on the server
+    host:
+   </para>
+
+<!--  TODO: indicate where these are discussed -->
+
+   <itemizedlist>
+
+    <indexterm type="concept">
+     <primary><command>myisamchk</command></primary>
+    </indexterm>
+
+    <listitem><para>
+     <literal>myisamchk</literal>
+    </para>
+
+    <para>
+     A utility to describe, check, optimize, and repair
+     <literal>MyISAM</literal> tables. <command>myisamchk</command> is
+     described in <xref linkend="table-maintenance"/>.
+    </para>
+
+    <para>
+     <indexterm type="concept">
+      <primary><command>make_binary_distribution</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>make_binary_distribution</literal>
+    </para>
+
+    <para>
+     This program makes a binary release of a compiled MySQL. This could
+     be sent by FTP to <filename>/pub/mysql/upload/</filename> on
+     <literal>ftp.mysql.com</literal> for the convenience of other MySQL
+     users.
+    </para>
+
+    <para>
+     <indexterm type="concept">
+      <primary><command>mysqlbug</command></primary>
+     </indexterm>
+    </para></listitem>
+
+    <listitem><para>
+     <literal>mysqlbug</literal>
+    </para>
+
+    <para>
+     The MySQL bug reporting script. It can be used to send a bug report
+     to the MySQL mailing list. (You can also visit
+     <ulink url="http://bugs.mysql.com/">http://bugs.mysql.com/</ulink>
+     to file a bug report online. See <xref linkend="bug-reports"/>.)
+    </para></listitem>
+
+   </itemizedlist>
+
   </section>
-  
+
   <section id="mysqld-max">
 
    <title id='title-mysqld-max'>&title-mysqld-max;</title>
@@ -2855,22 +2855,22 @@
      as the filename.
     </para></listitem>
 
-  <listitem><para>
-   <option>--log-bin-trust-routine-creators[={0|1}]</option>
-  </para>
+    <listitem><para>
+     <option>--log-bin-trust-routine-creators[={0|1}]</option>
+    </para>
 
-  <para>
-   With no argument or an argument of 1, this option sets the
-   <literal>log_bin_trust_routine_creators</literal> system variable to
-   1. With an argument of 0, this option sets the system variable to 0.
-   <literal>log_bin_trust_routine_creators</literal> affects how MySQL
-   enforces restrictions on stored routine creation. See
-   <xref linkend="stored-procedure-logging"/>.
-  </para>
+    <para>
+     With no argument or an argument of 1, this option sets the
+     <literal>log_bin_trust_routine_creators</literal> system variable
+     to 1. With an argument of 0, this option sets the system variable
+     to 0. <literal>log_bin_trust_routine_creators</literal> affects how
+     MySQL enforces restrictions on stored routine creation. See
+     <xref linkend="stored-procedure-logging"/>.
+    </para>
 
-  <para>
-   This option was added in MySQL 5.0.6.
-  </para></listitem>
+    <para>
+     This option was added in MySQL 5.0.6.
+    </para></listitem>
 
     <listitem><para>
      <literal>--log-error[=<replaceable>file</replaceable>]</literal>
@@ -4062,8 +4062,7 @@
      DIRECTORY</literal> and <literal>DATA DIRECTORY</literal>
      directives. This option is useful on slave replication servers.
      (New in MySQL 4.0.15)
-    </para>
-    </listitem>
+    </para></listitem>
 
     <listitem><para>
      <literal>NO_ENGINE_SUBSTITUTION</literal>
@@ -6334,35 +6333,35 @@
      3.23.14. See <xref linkend="binary-log"/>.
     </para></listitem>
 
-  <listitem><para>
-   log_bin_trust_routine_creators
-  </para>
+    <listitem><para>
+     log_bin_trust_routine_creators
+    </para>
 
-  <para>
-   This variable applies when binary logging is enabled. It controls
-   whether stored routine creators can be trusted not to create stored
-   routines that will cause unsafe events to be written to the binary
-   log. If set to 0 (the default), users are not allowed to create or
-   alter stored routines unless they have the <literal>SUPER</literal>
-   privilege in addition to the <literal>CREATE ROUTINE</literal> or
-   <literal>ALTER ROUTINE</literal> privilege.
-  </para>
+    <para>
+     This variable applies when binary logging is enabled. It controls
+     whether stored routine creators can be trusted not to create stored
+     routines that will cause unsafe events to be written to the binary
+     log. If set to 0 (the default), users are not allowed to create or
+     alter stored routines unless they have the <literal>SUPER</literal>
+     privilege in addition to the <literal>CREATE ROUTINE</literal> or
+     <literal>ALTER ROUTINE</literal> privilege.
+    </para>
 
-  <para>
-   A setting of 0 also enforces the restriction that a routine must be
-   declared with the <literal>DETERMINISTIC</literal> characteristic, or
-   with the <literal>READS SQL DATA</literal> or <literal>NO
-   SQL</literal> characteristic. If the variable is set to 1, MySQL does
-   not enforce these restrictions on stored routine creation.
-  </para>
+    <para>
+     A setting of 0 also enforces the restriction that a routine must be
+     declared with the <literal>DETERMINISTIC</literal> characteristic,
+     or with the <literal>READS SQL DATA</literal> or <literal>NO
+     SQL</literal> characteristic. If the variable is set to 1, MySQL
+     does not enforce these restrictions on stored routine creation.
+    </para>
 
-  <para>
-   See <xref linkend="stored-procedure-logging"/>.
-  </para>
+    <para>
+     See <xref linkend="stored-procedure-logging"/>.
+    </para>
 
-  <para>
-   This variable was added in MySQL 5.0.6.
-  </para></listitem>
+    <para>
+     This variable was added in MySQL 5.0.6.
+    </para></listitem>
 
     <listitem><para>
      <literal>log_error</literal>
@@ -10045,18 +10044,20 @@
      The number of physical writes of a key block to disk.
     </para></listitem>
 
-    <listitem>
-      <para><literal>Last_query_cost</literal></para>
+    <listitem><para>
+     <literal>Last_query_cost</literal>
+    </para>
 
-      <para>The total cost of the last compiled query as computed by the
-      query optimizer. Useful for comparing the cost of different query
-      plans for the same query. The default value of 0 means that no
-      query has been compiled yet. This variable was added in MySQL
-      5.0.1, with a default value of -1. In MySQL 5.0.7, the default was
-      changed to 0; also in version 5.0.7, the scope of
-      <literal>Last_query_cost</literal> was changed to session rather
-      than a global.</para>
-    </listitem>
+    <para>
+     The total cost of the last compiled query as computed by the query
+     optimizer. Useful for comparing the cost of different query plans
+     for the same query. The default value of 0 means that no query has
+     been compiled yet. This variable was added in MySQL 5.0.1, with a
+     default value of -1. In MySQL 5.0.7, the default was changed to 0;
+     also in version 5.0.7, the scope of
+     <literal>Last_query_cost</literal> was changed to session rather
+     than a global.
+    </para></listitem>
 
     <listitem><para>
      <literal>Max_used_connections</literal>
@@ -13444,20 +13445,23 @@
     </para></listitem>
 
     <listitem><para>
-     Note: The netmask can only be used to tell the server to
-     use 8, 16, 24, or 32 bits of the address, for example:
-     <programlisting>
+     Note: The netmask can only be used to tell the server to use 8, 16,
+     24, or 32 bits of the address, for example:
+
+<programlisting>
 192.0.0.0/255.0.0.0 (anything on the 192 class A network)
 192.168.0.0/255.255.0.0 (anything on the 192.168 class B network)
 192.168.1.0/255.255.255.0 (anything on the 192.168.1 class C network)
 192.168.1.1 (only this specific IP) 
      </programlisting>
+
      The following netmask (28 bits) will not work:
-     <programlisting>
+
+<programlisting>
 192.168.0.1/255.255.255.240
      </programlisting>
-    </para></listitem> 
-    
+    </para></listitem>
+
     <listitem><para>
      A blank <literal>Host</literal> value in a <literal>db</literal>
      table record means that its privileges should be combined with
@@ -15527,17 +15531,16 @@
     </para></listitem>
 
     <listitem><para>
-     MySQL usernames can be up to 16 characters long.
-     Changing the maximum length is not supported. If you still try to
-     change it, for example by changing the length of the
-     <literal>User</literal> column in the <literal>mysql</literal>
-     database tables, this will likely result in strange and unpredictable 
-     effects. (Altering privilege tables isn't supported, anyway.)
-     Operating system
+     MySQL usernames can be up to 16 characters long. Changing the
+     maximum length is not supported. If you still try to change it, for
+     example by changing the length of the <literal>User</literal>
+     column in the <literal>mysql</literal> database tables, this will
+     likely result in strange and unpredictable effects. (Altering
+     privilege tables isn't supported, anyway.) Operating system
      usernames might have a different maximum length. For example, Unix
      usernames typically are limited to eight characters.
-    </para></listitem> 
-    
+    </para></listitem>
+
     <listitem><para>
      MySQL passwords have nothing to do with passwords for logging in to
      your operating system. There is no necessary connection between the
@@ -20558,8 +20561,8 @@
       one-character to two-character mapping is not done. All letters
       are converted to uppercase. Accents are removed from all letters
       except <literal>Ü</literal>, <literal>ü</literal>,
-      <literal>Ö</literal>, <literal>ö</literal>, <literal>Ä</literal>,
-      and <literal>ä</literal>.
+      <literal>Ö</literal>, <literal>ö</literal>,
+      <literal>Ä</literal>, and <literal>ä</literal>.
      </para></listitem>
 
     </itemizedlist>
@@ -23097,10 +23100,10 @@
   </para>
 
   <para>
-   <emphasis role="bold">Note</emphasis>: The query cache isn't used
-   for server-side prepared statements. If you're using server-side prepared 
-   statements consider that these statement won't be satisfied by the query
-   cache. See <xref linkend="c-api-prepared-statements"/>.
+   <emphasis role="bold">Note</emphasis>: The query cache isn't used for
+   server-side prepared statements. If you're using server-side prepared
+   statements consider that these statement won't be satisfied by the
+   query cache. See <xref linkend="c-api-prepared-statements"/>.
   </para>
 
   <para>

--- 1.44/refman/news.xml	2005-07-07 20:47:48 -05:00
+++ 1.45/refman/news.xml	2005-07-07 21:01:59 -05:00
@@ -205,40 +205,35 @@
    For a full list of changes, please refer to the changelog sections
    for each individual 5.0.x release.
   </para>
-  
+
   <section id="news-5-0-10">
-    
-    <title id="title-news-5-0-10">&title-news-5-0-10;</title>
-        
-    <para>
-      Functionality added or changed:
-    </para>
-    
-    <itemizedlist>
-      
-      <listitem>
-        <para>
-        </para>
-      </listitem>
-      
-    </itemizedlist>
-    
-    <para>
-      Bugs fixed:
-    </para>
-    
-    <itemizedlist>
-      
-      <listitem>
-        <para>
-          In a shared Windows environment, MySQL could not find its 
-          configuration file unless the file was in the 
-          <filename>C:\</filename> directory. (Bug #5354)
-        </para>
-      </listitem>
-    
-    </itemizedlist>
-    
+
+   <title id="title-news-5-0-10">&title-news-5-0-10;</title>
+
+   <para>
+    Functionality added or changed:
+   </para>
+
+   <itemizedlist>
+
+    <listitem><para></para></listitem>
+
+   </itemizedlist>
+
+   <para>
+    Bugs fixed:
+   </para>
+
+   <itemizedlist>
+
+    <listitem><para>
+     In a shared Windows environment, MySQL could not find its
+     configuration file unless the file was in the
+     <filename>C:\</filename> directory. (Bug #5354)
+    </para></listitem>
+
+   </itemizedlist>
+
   </section>
 
   <section id="news-5-0-9">
@@ -246,38 +241,32 @@
    <title id="title-news-5-0-9">&title-news-5-0-9;</title>
 
    <para>
-     Functionality added or changed:
+    Functionality added or changed:
    </para>
 
    <itemizedlist>
 
-    <listitem>
-      <para>
-        <literal>InnoDB</literal>: When creating or extending an InnoDB
-        data file, at most one megabyte at a time is allocated for 
-        initializing the file. Previously, InnoDB allocated and 
-        initialized 1 or 8 megabytes of memory, even if only a few 
-        16-kilobyte pages were to be written. This improves the 
-        performance of <literal>CREATE TABLE</literal> in 
-        <literal>innodb_file_per_table</literal> mode.
-      </para>
-    </listitem>
-  
-    <listitem>
-      <para>
-        Recursion in stored routines is now disabled because it was 
-        crashing the server. We plan to modify stored routines to 
-        allow this to operate safely in a future release. (Bug #11394)
-      </para>
-    </listitem>
-    
-    <listitem>
-      <para>
-        The handling of <literal>BIT</literal> columns has been 
-        improved, and should now be much more reliable in a number of 
-        cases. (Bug #10617, Bug #11091, Bug #11572)
-      </para>
-    </listitem>
+    <listitem><para>
+     <literal>InnoDB</literal>: When creating or extending an InnoDB
+     data file, at most one megabyte at a time is allocated for
+     initializing the file. Previously, InnoDB allocated and initialized
+     1 or 8 megabytes of memory, even if only a few 16-kilobyte pages
+     were to be written. This improves the performance of
+     <literal>CREATE TABLE</literal> in
+     <literal>innodb_file_per_table</literal> mode.
+    </para></listitem>
+
+    <listitem><para>
+     Recursion in stored routines is now disabled because it was
+     crashing the server. We plan to modify stored routines to allow
+     this to operate safely in a future release. (Bug #11394)
+    </para></listitem>
+
+    <listitem><para>
+     The handling of <literal>BIT</literal> columns has been improved,
+     and should now be much more reliable in a number of cases. (Bug
+     #10617, Bug #11091, Bug #11572)
+    </para></listitem>
 
    </itemizedlist>
 
@@ -286,71 +275,59 @@
    </para>
 
    <itemizedlist>
-     
-     <listitem>
-       <para>
-         In strict mode, an <literal>INSERT</literal> into a view that 
-         did not include a value for a <literal>NOT NULL</literal> 
-         column but that did include a <literal>WHERE</literal> test on 
-         the same column would succeed, This happened even though the 
-         <literal>INSERT</literal> should have been prevented due to the
-         failure to supply a value for the <literal>NOT NULL</literal> 
-         column. (Bug #6443)
-       </para>
-     </listitem>
-     
-     <listitem>
-       <para>
-         Running a <literal>CHECK TABLES</literal> on multiple views 
-         crashed the server. (Bug #11337)
-       </para>
-     </listitem>
-     
-     <listitem>
-       <para>
-         When a table had a primary key containing a 
-         <literal>BLOB</literal> column, creation of another index 
-         failed with the error <literal>BLOB/TEXT column used in key 
-         specification without keylength</literal>, even when the new 
-         index did not contain a <literal>BLOB</literal> column. (Bug 
-         #11657)
-       </para>
-     </listitem>
-     
-     <listitem>
-       <para>
-         NDB Cluster: When trying to open a table that could not be 
-         discovered or unpacked, cluster would return error codes which 
-         the MySQL server falsely interpreted as operating system errors. 
-         (Bug #103651)
-       </para>
-     </listitem>
-     
-     <listitem>
-       <para>
-         Manually inserting a row with <literal>host=''</literal> into 
-         <literal>mysql.tables_priv</literal> and performing a 
-         <literal>FLUSH PRIVILEGES</literal> would cause the server to 
-         crash. (Bug #11330)
-       </para>
-    </listitem>
-     
-      <listitem>
-        <para>A cursor using a query with a filter on a 
-          <literal>DATE</literal> or <literal>DATETIME</literal> column 
-          would cause the server to crash server after the data was 
-          fetched. (Bug #11172)</para>
-      </listitem>
-     
-     <listitem><para>
-         Closing a cursor that was already closed would cause MySQL to 
-         hang. (Bug #9814)
-       </para></listitem>
-     
-     <listitem><para>
-         Using <literal>CONCAT_WS</literal> on a column set <literal>NOT
-           NULL</literal> caused incorrect results when used in a
-         <literal>LEFT JOIN</literal>. (Bug #11469)
+
+    <listitem><para>
+     In strict mode, an <literal>INSERT</literal> into a view that did
+     not include a value for a <literal>NOT NULL</literal> column but
+     that did include a <literal>WHERE</literal> test on the same column
+     would succeed, This happened even though the
+     <literal>INSERT</literal> should have been prevented due to the
+     failure to supply a value for the <literal>NOT NULL</literal>
+     column. (Bug #6443)
+    </para></listitem>
+
+    <listitem><para>
+     Running a <literal>CHECK TABLES</literal> on multiple views crashed
+     the server. (Bug #11337)
+    </para></listitem>
+
+    <listitem><para>
+     When a table had a primary key containing a <literal>BLOB</literal>
+     column, creation of another index failed with the error
+     <literal>BLOB/TEXT column used in key specification without
+     keylength</literal>, even when the new index did not contain a
+     <literal>BLOB</literal> column. (Bug #11657)
+    </para></listitem>
+
+    <listitem><para>
+     NDB Cluster: When trying to open a table that could not be
+     discovered or unpacked, cluster would return error codes which the
+     MySQL server falsely interpreted as operating system errors. (Bug
+     #103651)
+    </para></listitem>
+
+    <listitem><para>
+     Manually inserting a row with <literal>host=''</literal> into
+     <literal>mysql.tables_priv</literal> and performing a
+     <literal>FLUSH PRIVILEGES</literal> would cause the server to
+     crash. (Bug #11330)
+    </para></listitem>
+
+    <listitem><para>
+     A cursor using a query with a filter on a <literal>DATE</literal>
+     or <literal>DATETIME</literal> column would cause the server to
+     crash server after the data was fetched. (Bug #11172)
+    </para></listitem>
+
+    <listitem><para>
+     Closing a cursor that was already closed would cause MySQL to hang.
+     (Bug #9814)
+    </para></listitem>
+
+    <listitem><para>
+     Using <literal>CONCAT_WS</literal> on a column set <literal>NOT
+     NULL</literal> caused incorrect results when used in a
+     <literal>LEFT JOIN</literal>. (Bug #11469)
     </para></listitem>
 
     <listitem><para>
@@ -1357,20 +1334,20 @@
      MySQL 5.0.3 to 5.0.5.) (Bug #10465, Bug #10625)
     </para></listitem>
 
-  <listitem><para>
-   Added the <literal>log_bin_trust_routine_creators</literal> system
-   variable, which applies when binary logging is enabled. It controls
-   whether stored routine creators can be trusted not to create stored
-   routines that will cause unsafe events to be written to the binary
-   log.
-  </para></listitem>
-
-  <listitem><para>
-   Added the <option>--log-bin-trust-routine-creators</option> server
-   option for setting the
-   <literal>log_bin_trust_routine_creators</literal> system variable
-   from the command line.
-  </para></listitem>
+    <listitem><para>
+     Added the <literal>log_bin_trust_routine_creators</literal> system
+     variable, which applies when binary logging is enabled. It controls
+     whether stored routine creators can be trusted not to create stored
+     routines that will cause unsafe events to be written to the binary
+     log.
+    </para></listitem>
+
+    <listitem><para>
+     Added the <option>--log-bin-trust-routine-creators</option> server
+     option for setting the
+     <literal>log_bin_trust_routine_creators</literal> system variable
+     from the command line.
+    </para></listitem>
 
     <listitem><para>
      Implemented the <literal>STMT_ATTR_PREFETCH_ROWS</literal> option
@@ -2959,8 +2936,8 @@
     </para></listitem>
 
     <listitem><para>
-     InnoDB: Relaxed locking in <literal>INSERT…SELECT</literal>, single
-     table <literal>UPDATE…SELECT</literal> and single table
+     InnoDB: Relaxed locking in <literal>INSERT…SELECT</literal>,
+     single table <literal>UPDATE…SELECT</literal> and single table
      <literal>DELETE…SELECT</literal> clauses when
      <literal>innodb_locks_unsafe_for_binlog</literal> is used and
      isolation level of the transaction is not serializable.
@@ -4861,39 +4838,31 @@
 <!-- NOTE: No need to start every item with "Fixed..."; sufficient to
      describe the issue that was fixed. Use past tense. -->
 
-    <listitem>
-      <para>
-        Incorrect results when searching using <literal>IN()</literal>
-        where search items included <literal>NULL</literal> and
-        <literal>0</literal>. (Bug #9393)
-      </para>
-    </listitem>
-    
-    <listitem>
-      <para>
-        NDB Cluster: When trying to open a table that could not be 
-        discovered or unpacked, cluster would return error codes which 
-        the MySQL server falsely interpreted as operating system errors. 
-        (Bug #103651)
-      </para>
-    </listitem>
+    <listitem><para>
+     Incorrect results when searching using <literal>IN()</literal>
+     where search items included <literal>NULL</literal> and
+     <literal>0</literal>. (Bug #9393)
+    </para></listitem>
 
-    <listitem>
-      <para>
-        Manually inserting a row with <literal>host=''</literal> into 
-        <literal>mysql.tables_priv</literal> and performing a 
-        <literal>FLUSH PRIVILEGES</literal> would cause the server to 
-        crash. (Bug #11330)
-      </para>
-    </listitem>
+    <listitem><para>
+     NDB Cluster: When trying to open a table that could not be
+     discovered or unpacked, cluster would return error codes which the
+     MySQL server falsely interpreted as operating system errors. (Bug
+     #103651)
+    </para></listitem>
 
-    <listitem>
-      <para>
-        MySQL sometimes reported erroneously that certain character 
-        values had crashed a table when trying to convert other 
-        character sets to UTF-8. (Bug #9557)
-      </para>
-    </listitem>
+    <listitem><para>
+     Manually inserting a row with <literal>host=''</literal> into
+     <literal>mysql.tables_priv</literal> and performing a
+     <literal>FLUSH PRIVILEGES</literal> would cause the server to
+     crash. (Bug #11330)
+    </para></listitem>
+
+    <listitem><para>
+     MySQL sometimes reported erroneously that certain character values
+     had crashed a table when trying to convert other character sets to
+     UTF-8. (Bug #9557)
+    </para></listitem>
 
     <listitem><para>
      Using <literal>CONCAT_WS()</literal> on a column set <literal>NOT
@@ -5376,9 +5345,9 @@
      isolation level of the transaction is not set to serializable then
      <literal>InnoDB</literal> uses a consistent read for select in
      clauses like <literal>INSERT INTO…SELECT</literal> and
-     <literal>UPDATE…(SELECT)</literal> that do not specify <literal>FOR
-     UPDATE</literal> or <literal>IN SHARE MODE</literal>. Thus no locks
-     are set to rows read from selected table.
+     <literal>UPDATE…(SELECT)</literal> that do not specify
+     <literal>FOR UPDATE</literal> or <literal>IN SHARE MODE</literal>.
+     Thus no locks are set to rows read from selected table.
     </para></listitem>
 
     <listitem><para>
@@ -6719,8 +6688,8 @@
     </para></listitem>
 
     <listitem><para>
-     InnoDB: Relaxed locking in <literal>INSERT…SELECT</literal>, single
-     table <literal>UPDATE…SELECT</literal> and single table
+     InnoDB: Relaxed locking in <literal>INSERT…SELECT</literal>,
+     single table <literal>UPDATE…SELECT</literal> and single table
      <literal>DELETE…SELECT</literal> clauses when
      <literal>innodb_locks_unsafe_for_binlog</literal> is used and
      isolation level of the transaction is not serializable.
@@ -7972,9 +7941,9 @@
     </para></listitem>
 
     <listitem><para>
-     InnoDB: Fixed a bug in <literal>LOAD DATA INFILE…REPLACE</literal>
-     printing duplicate key error when executing the same load query
-     several times. (Bug #5835)
+     InnoDB: Fixed a bug in <literal>LOAD DATA
+     INFILE…REPLACE</literal> printing duplicate key error when
+     executing the same load query several times. (Bug #5835)
     </para></listitem>
 
     <listitem><para>
@@ -11902,9 +11871,9 @@
     </para></listitem>
 
     <listitem><para>
-     InnoDB: Fixed a bug in <literal>LOAD DATA INFILE…REPLACE</literal>
-     printing duplicate key error when executing the same load query
-     several times. (Bug #5835)
+     InnoDB: Fixed a bug in <literal>LOAD DATA
+     INFILE…REPLACE</literal> printing duplicate key error when
+     executing the same load query several times. (Bug #5835)
     </para></listitem>
 
     <listitem><para>
Thread
bk commit - mysqldoc@docsrva tree (paul:1.2957)paul8 Jul