List:Commits« Previous MessageNext Message »
From:paul Date:January 28 2006 7:13pm
Subject:svn commit - mysqldoc@docsrva: r1079 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-28 20:13:01 +0100 (Sat, 28 Jan 2006)
New Revision: 1079

Log:
 r6807@frost:  paul | 2006-01-28 12:12:06 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/client-utility-programs.xml
   trunk/refman-4.1/connector-odbc.xml
   trunk/refman-4.1/database-administration.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/client-utility-programs.xml
   trunk/refman-5.0/connector-odbc.xml
   trunk/refman-5.0/database-administration.xml
   trunk/refman-5.0/installing.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/client-utility-programs.xml
   trunk/refman-5.1/connector-odbc.xml
   trunk/refman-5.1/database-administration.xml
   trunk/refman-5.1/installing.xml
   trunk/refman-5.1/sql-syntax.xml


Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6806
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588
   + b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6807
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2588

Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-4.1/client-utility-programs.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -6402,7 +6402,9 @@
           <literal>OPTIMIZE TABLE</literal> in a convenient way for the
           user. It determines which statements to use for the operation
           you want to perform, and then sends the statements to the
-          server to be executed.
+          server to be executed. For details about which storage engines
+          each statement works with, see the descriptions for those
+          statements in <xref linkend="sql-syntax"/>.
         </para>
 
         <para>

Modified: trunk/refman-4.1/connector-odbc.xml
===================================================================
--- trunk/refman-4.1/connector-odbc.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-4.1/connector-odbc.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -1450,10 +1450,10 @@
 
       <para>
         In case while configuring with thread-safe option, and gotten
-        into a configure error; then look at the
-        <filename>config.log</filename> and see whether it is due to the
-        lack of thread-libraries in the system; and supply one with LIBS
-        options i.e.
+        into a configure error, look at the
+        <filename>config.log</filename> and determine whether the error
+        is due to the lack of thread-libraries in the system; and supply
+        one with LIBS options i.e.
       </para>
 
 <programlisting>
@@ -1888,10 +1888,10 @@
 
       <para>
         Once the driver is built, cross-check its attributes using
-        <command>chatr .libs/libmyodbc3.sl</command> to see whether or
-        not you need to have the MySQL client libraries path using the
-        <literal>SHLIB_PATH</literal> environment variable. For static
-        versions, ignore all shared-library options and run
+        <command>chatr .libs/libmyodbc3.sl</command> to determine
+        whether you need to have the MySQL client libraries path using
+        the <literal>SHLIB_PATH</literal> environment variable. For
+        static versions, ignore all shared-library options and run
         <command>configure</command> with the
         <option>--disable-shared</option> option.
       </para>

Modified: trunk/refman-4.1/database-administration.xml
===================================================================
--- trunk/refman-4.1/database-administration.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-4.1/database-administration.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -10030,8 +10030,8 @@
             processlist</command> and <literal>SHOW
             PROCESSLIST</literal> shows the text of any statements
             currently being executed, so any user who is allowed to see
-            the server process list might be able to see whether another
-            user issues a statement such as <literal>UPDATE user SET
+            the server process list might be able to see statements
+            issued by other users such as <literal>UPDATE user SET
             password=PASSWORD('not_secure')</literal>.
           </para>
 
@@ -10645,21 +10645,20 @@
 
         <listitem>
           <para>
-            <emphasis role="bold">Stage 1</emphasis>: The server checks
-            whether it should allow you to connect.
+            Stage 1: The server checks whether it should allow you to
+            connect.
           </para>
         </listitem>
 
         <listitem>
           <para>
-            <emphasis role="bold">Stage 2</emphasis>: Assuming that you
-            can connect, the server checks each statement you issue to
-            see whether you have sufficient privileges to perform it.
-            For example, if you try to select rows from a table in a
-            database or drop a table from the database, the server
-            verifies that you have the <literal>SELECT</literal>
-            privilege for the table or the <literal>DROP</literal>
-            privilege for the database.
+            Stage 2: Assuming that you can connect, the server checks
+            each statement you issue to determine whether you have
+            sufficient privileges to perform it. For example, if you try
+            to select rows from a table in a database or drop a table
+            from the database, the server verifies that you have the
+            <literal>SELECT</literal> privilege for the table or the
+            <literal>DROP</literal> privilege for the database.
           </para>
         </listitem>
 

Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-4.1/installing.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -802,8 +802,8 @@
 
             <para>
               This suite runs a range of common queries. It is also a
-              test to see whether the latest batch of optimizations
-              actually made the code faster. See
+              test to determine whether the latest batch of
+              optimizations actually made the code faster. See
               <xref linkend="mysql-benchmarks"/>.
             </para>
           </listitem>
@@ -7150,10 +7150,10 @@
     </remark>
 
     <para>
-      Before you proceed with the source installation, check first to
-      see whether our binary is available for your platform and whether
-      it works for you. We put a lot of effort into making sure that our
-      binaries are built with the best possible options.
+      Before you proceed with the source installation, first check
+      whether our binary is available for your platform and whether it
+      works for you. We put a great deal of effort into ensuring that
+      our binaries are built with the best possible options.
     </para>
 
     <para>
@@ -14107,14 +14107,14 @@
           against the best patched version of <literal>glibc</literal>
           we can find and with the best compiler options, in an attempt
           to make it suitable for a high-load server. For a typical
-          user, even for setups with many concurrent connections or
+          user, even for setups with a lot of concurrent connections or
           tables exceeding the 2GB limit, our binary is the best choice
           in most cases. After reading the following text, if you are in
-          doubt about what to do, try our binary first to see whether it
-          meets your needs. If you discover that it is not good enough,
-          you may want to try your own build. In that case, we would
-          appreciate a note about it so that we can build a better
-          binary next time.
+          doubt about what to do, try our binary first to determine
+          whether it meets your needs. If you discover that it is not
+          good enough, you may want to try your own build. In that case,
+          we would appreciate a note about it so that we can build a
+          better binary next time.
         </para>
 
         <para>
@@ -16769,8 +16769,8 @@
             <para>
               Many applications use setuid binaries so that you need to
               specify only a single user. See the documentation provided
-              with the application to see whether this is the case for
-              your application.
+              with the application to determine whether this is the case
+              for your application.
             </para>
           </listitem>
 

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -8723,7 +8723,7 @@
         </para>
 
 <programlisting>
-SELECT table1.* FROM table1 
+SELECT table1.* FROM table1
   LEFT JOIN table2 ON table1.id=table2.id
   WHERE table2.id IS NULL;
 </programlisting>
@@ -11336,8 +11336,10 @@
               provided that you omit those columns for which you do not
               have the <literal>INSERT</literal> privilege. The omitted
               columns are set to their implicit default values.
-              <xref linkend="create-table"/>, discusses implicit default
-              values.
+              (Standard SQL requires you to have the
+              <literal>INSERT</literal> privilege on all columns.)
+              <xref linkend="data-type-defaults"/>, discusses implicit
+              default values.
             </para>
           </listitem>
 
@@ -11388,7 +11390,7 @@
 
         <para>
           The second syntax sets the password for a specific account on
-          the current server host. Only clients with the
+          the current server host. Only clients that have the
           <literal>UPDATE</literal> privilege for the
           <literal>mysql</literal> database can do this. The
           <replaceable>user</replaceable> value should be given in
@@ -11405,7 +11407,7 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SET PASSWORD FOR 'bob'@'%.loc.gov' = PASSWORD('<replaceable>newpass</replaceable>');</userinput>
+SET PASSWORD FOR 'bob'@'%.loc.gov' = PASSWORD('<replaceable>newpass</replaceable>');
 </programlisting>
 
         <remark role="help-description-end"/>
@@ -11415,9 +11417,9 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>UPDATE mysql.user SET Password=PASSWORD('<replaceable>newpass</replaceable>')</userinput>
-    -&gt; <userinput>WHERE User='bob' AND Host='%.loc.gov';</userinput>
-mysql&gt; <userinput>FLUSH PRIVILEGES;</userinput>
+UPDATE mysql.user SET Password=PASSWORD('<replaceable>newpass</replaceable>')
+  WHERE User='bob' AND Host='%.loc.gov';
+FLUSH PRIVILEGES;
 </programlisting>
 
         <para>
@@ -11432,9 +11434,9 @@
         </para>
 
         <para>
-          Starting from MySQL 4.1, you can check what your current
-          authentication <literal>user@host</literal> entry is by
-          executing <literal>SELECT CURRENT_USER()</literal>.
+          Starting from MySQL 4.1, you can see which account the server
+          authenticated you as by executing <literal>SELECT
+          CURRENT_USER()</literal>.
         </para>
 
       </section>
@@ -11468,11 +11470,11 @@
         <remark role="help-description-begin"/>
 
         <para>
-          This statement analyzes and stores the key distribution for a
-          table. During the analysis, the table is locked with a read
-          lock. This works on <literal>MyISAM</literal> and
-          <literal>BDB</literal> tables and (as of MySQL 4.0.13)
-          <literal>InnoDB</literal> tables. For
+          <literal>ANALYZE TABLE</literal> analyzes and stores the key
+          distribution for a table. During the analysis, the table is
+          locked with a read lock. This statement works with
+          <literal>MyISAM</literal>, <literal>BDB</literal>, and (as of
+          MySQL 4.0.13) <literal>InnoDB</literal> tables. For
           <literal>MyISAM</literal> tables, this statement is equivalent
           to using <command>myisamchk -a</command>.
         </para>
@@ -11486,7 +11488,8 @@
         <remark role="help-description-end"/>
 
         <para>
-          The statement returns a table with the following columns:
+          <literal>ANALYZE TABLE</literal> returns a result set with the
+          following columns:
         </para>
 
         <informaltable>
@@ -11586,27 +11589,24 @@
           <filename>.MYD</filename> data files. The
           <filename>.MYI</filename> index file can be rebuilt from those
           two files. The directory should be specified as a full
-          pathname.
+          pathname. To restore the table, use <literal>RESTORE
+          TABLE</literal>.
         </para>
 
         <remark role="help-description-end"/>
 
         <para>
-          Before using this statement, please see
-          <xref linkend="backup"/>.
-        </para>
-
-        <para>
           During the backup, a read lock is held for each table, one at
           time, as they are being backed up. If you want to back up
           several tables as a snapshot (preventing any of them from
-          being changed during the backup operation), you must first
-          issue a <literal>LOCK TABLES</literal> statement to obtain a
-          read lock for every table in the group.
+          being changed during the backup operation), issue a
+          <literal>LOCK TABLES</literal> statement first, to obtain a
+          read lock for all tables in the group.
         </para>
 
         <para>
-          The statement returns a table with the following columns:
+          <literal>BACKUP TABLE</literal> returns a result set with the
+          following columns:
         </para>
 
         <informaltable>
@@ -11671,18 +11671,18 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Checks a table or tables for errors. <literal>CHECK
-          TABLE</literal> works for <literal>MyISAM</literal> and
-          <literal>InnoDB</literal> tables. For
-          <literal>MyISAM</literal> tables, the key statistics are
-          updated.
+          <literal>CHECK TABLE</literal> checks a table or tables for
+          errors. <literal>CHECK TABLE</literal> works for
+          <literal>MyISAM</literal> and <literal>InnoDB</literal>
+          tables. For <literal>MyISAM</literal> tables, the key
+          statistics are updated as well.
         </para>
 
         <remark role="help-description-end"/>
 
         <para>
-          The <literal>CHECK TABLE</literal> statement returns a table
-          with the following columns:
+          <literal>CHECK TABLE</literal> returns a result set with the
+          following columns:
         </para>
 
         <informaltable>
@@ -11790,9 +11790,9 @@
         </para>
 
         <para>
-          You can combine check options, as in the following example,
-          which does a quick check on the table to see whether it was
-          closed properly:
+          You can combine check options, as in the following example
+          that does a quick check on the table to determine whether it
+          was closed properly:
         </para>
 
 <programlisting>
@@ -11841,8 +11841,8 @@
         <para>
           <literal>EXTENDED</literal> is to be used only after you have
           run a normal check but still get strange errors from a table
-          when MySQL tries to update a row or find a row by key. (This
-          is very unlikely if a normal check has succeeded.)
+          when MySQL tries to update a row or find a row by key. This is
+          very unlikely if a normal check has succeeded.
         </para>
 
         <para>
@@ -11907,35 +11907,35 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Reports a table checksum.
+          <literal>CHECKSUM TABLE</literal> reports a table checksum.
         </para>
 
         <para>
-          If <literal>QUICK</literal> is specified, the live table
-          checksum is reported if it is available, or
-          <literal>NULL</literal> otherwise. This is very fast. A live
-          checksum is enabled by specifying the
-          <literal>CHECKSUM=1</literal> table option, currently
-          supported only for <literal>MyISAM</literal> tables. See
+          With <literal>QUICK</literal>, the live table checksum is
+          reported if it is available, or <literal>NULL</literal>
+          otherwise. This is very fast. A live checksum is enabled by
+          specifying the <literal>CHECKSUM=1</literal> table option when
+          you create the table; currently, this is supported only for
+          <literal>MyISAM</literal> tables. See
           <xref linkend="create-table"/>.
         </para>
 
         <para>
-          In <literal>EXTENDED</literal> mode the whole table is read
-          row by row and the checksum is calculated. This can be very
-          slow for large tables.
+          With <literal>EXTENDED</literal>, the entire table is read row
+          by row and the checksum is calculated. This can be very slow
+          for large tables.
         </para>
 
         <para>
-          By default, if neither <literal>QUICK</literal> nor
+          If neither <literal>QUICK</literal> nor
           <literal>EXTENDED</literal> is specified, MySQL returns a live
           checksum if the table storage engine supports it and scans the
           table otherwise.
         </para>
 
         <para>
-          <literal>CHECKSUM TABLE</literal> returns
-          <literal>NULL</literal> for non-existent tables.
+          For a non-existent table, <literal>CHECKSUM TABLE</literal>
+          returns <literal>NULL</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -11986,12 +11986,12 @@
           <literal>OPTIMIZE TABLE</literal> should be used if you have
           deleted a large part of a table or if you have made many
           changes to a table with variable-length rows (tables that have
-          <literal>VARCHAR</literal>, <literal>BLOB</literal>, or
-          <literal>TEXT</literal> columns). Deleted rows are maintained
-          in a linked list and subsequent <literal>INSERT</literal>
-          operations reuse old row positions. You can use
-          <literal>OPTIMIZE TABLE</literal> to reclaim the unused space
-          and to defragment the data file.
+          <literal>VARCHAR</literal>, <literal>VARBINARY</literal>,
+          <literal>BLOB</literal>, or <literal>TEXT</literal> columns).
+          Deleted rows are maintained in a linked list and subsequent
+          <literal>INSERT</literal> operations reuse old row positions.
+          You can use <literal>OPTIMIZE TABLE</literal> to reclaim the
+          unused space and to defragment the data file.
         </para>
 
         <remark role="help-description-end"/>
@@ -12005,7 +12005,7 @@
         </para>
 
         <para>
-          <literal>OPTIMIZE TABLE</literal> works only on
+          <literal>OPTIMIZE TABLE</literal> works only for
           <literal>MyISAM</literal>, <literal>BDB</literal>, and
           <literal>InnoDB</literal> tables.
         </para>
@@ -12042,23 +12042,61 @@
         <para>
           For <literal>BDB</literal> tables, <literal>OPTIMIZE
           TABLE</literal> currently is mapped to <literal>ANALYZE
-          TABLE</literal>. That was also the case for
-          <literal>InnoDB</literal> tables before MySQL 4.1.3; starting
-          from this version it is mapped to <literal>ALTER
-          TABLE</literal>, which rebuilds the table. Rebuilding updates
-          index statistics and frees unused space in the clustered
-          index. See <xref linkend="analyze-table"/>.
+          TABLE</literal>. See <xref linkend="analyze-table"/>.
         </para>
 
         <para>
+          That was also the case for <literal>InnoDB</literal> tables
+          before MySQL 4.1.3. As of 4.1.3, <literal>OPTIMIZE
+          TABLE</literal> is mapped to <literal>ALTER TABLE</literal>,
+          which rebuilds the table to update index statistics and free
+          unused space in the clustered index.
+        </para>
+
+        <para>
           You can make <literal>OPTIMIZE TABLE</literal> work on other
           storage engines by starting <command>mysqld</command> with the
           <option>--skip-new</option> or <option>--safe-mode</option>
-          option; in this case, <literal>OPTIMIZE TABLE</literal> is
+          option. In this case, <literal>OPTIMIZE TABLE</literal> is
           just mapped to <literal>ALTER TABLE</literal>.
         </para>
 
         <para>
+          <literal>OPTIMIZE TABLE</literal> returns a result set with
+          the following columns:
+        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <colspec colwidth="15*"/>
+            <colspec colwidth="60*"/>
+            <tbody>
+              <row>
+                <entry><emphasis role="bold">Column</emphasis></entry>
+                <entry><emphasis role="bold">Value</emphasis></entry>
+              </row>
+              <row>
+                <entry><literal>Table</literal></entry>
+                <entry>The table name</entry>
+              </row>
+              <row>
+                <entry><literal>Op</literal></entry>
+                <entry>Always <literal>optimize</literal></entry>
+              </row>
+              <row>
+                <entry><literal>Msg_type</literal></entry>
+                <entry>One of <literal>status</literal>, <literal>error</literal>,
+                  <literal>info</literal>, or <literal>warning</literal></entry>
+              </row>
+              <row>
+                <entry><literal>Msg_text</literal></entry>
+                <entry>The message</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+
+        <para>
           Note that MySQL locks the table during the time
           <literal>OPTIMIZE TABLE</literal> is running.
         </para>
@@ -12104,18 +12142,18 @@
           table. By default, it has the same effect as
           <command>myisamchk --recover
           <replaceable>tbl_name</replaceable></command>. <literal>REPAIR
-          TABLE</literal> works on <literal>MyISAM</literal> and on
+          TABLE</literal> works for <literal>MyISAM</literal> and for
           <literal>ARCHIVE</literal> tables. See
-          <xref linkend="myisam-storage-engine"/>,
+          <xref linkend="myisam-storage-engine"/>, and
           <xref linkend="archive-storage-engine"/>.
         </para>
 
         <remark role="help-description-end"/>
 
         <para>
-          Normally you should never have to run this statement. However,
-          if disaster strikes, <literal>REPAIR TABLE</literal> is very
-          likely to get back all your data from a
+          Normally, you should never have to run this statement.
+          However, if disaster strikes, <literal>REPAIR TABLE</literal>
+          is very likely to get back all your data from a
           <literal>MyISAM</literal> table. If tables become corrupted
           often, you should try to find the reason for it and so to
           eliminate the need to use <literal>REPAIR TABLE</literal>. See
@@ -12124,9 +12162,23 @@
         </para>
 
         <para>
-          This statement returns a table with the following columns:
+          <emphasis role="bold">Warning:</emphasis> If the server dies
+          during a <literal>REPAIR TABLE</literal> operation, it is
+          essential after restarting it that you immediately execute
+          another <literal>REPAIR TABLE</literal> statement for the
+          table before performing any other operations on it. (It is
+          always a good idea to start by making a backup.) In the worst
+          case, you might have a new clean index file without
+          information about the data file, and then the next operation
+          you perform could overwrite the data file. This is an unlikely
+          but possible scenario.
         </para>
 
+        <para>
+          <literal>REPAIR TABLE</literal> returns a result set with the
+          following columns:
+        </para>
+
         <informaltable>
           <tgroup cols="2">
             <colspec colwidth="15*"/>
@@ -12164,10 +12216,10 @@
           <literal>status</literal> and <literal>Msg_test</literal>
           normally should be <literal>OK</literal>. If you do not get
           <literal>OK</literal>, you should try repairing the table with
-          <command>myisamchk --safe-recover</command>, because
-          <literal>REPAIR TABLE</literal> does not yet implement all the
-          options of <command>myisamchk</command>. We plan to make it
-          more flexible in the future.
+          <command>myisamchk --safe-recover</command>. (<literal>REPAIR
+          TABLE</literal> does not yet implement all the options of
+          <command>myisamchk</command>. We plan to make it more flexible
+          in the future.)
         </para>
 
         <para>
@@ -12195,14 +12247,14 @@
           <filename>.frm</filename> file. This kind of repair cannot be
           done with <command>myisamchk</command>.
           <emphasis role="bold">Note</emphasis>: Use this mode
-          <emphasis role="bold">only</emphasis> if you cannot use
-          regular <literal>REPAIR</literal> modes.
-          <filename>.MYI</filename> header contains important table
-          metadata (in particular, current
-          <literal>AUTO_INCREMENT</literal> value and <literal>Delete
-          link</literal>) that are lost in <literal>REPAIR ...
-          USE_FRM</literal>. Don't use <literal>USE_FRM</literal> if the
-          table is compressed, as this information is also stored in
+          <emphasis>only</emphasis> if you cannot use regular
+          <literal>REPAIR</literal> modes. <filename>.MYI</filename>
+          header contains important table metadata (in particular,
+          current <literal>AUTO_INCREMENT</literal> value and
+          <literal>Delete link</literal>) that are lost in
+          <literal>REPAIR ... USE_FRM</literal>. Don't use
+          <literal>USE_FRM</literal> if the table is compressed because
+          this information is also stored in the
           <filename>.MYI</filename> file.
         </para>
 
@@ -12217,19 +12269,6 @@
           default to the replication slave.
         </para>
 
-        <para>
-          <emphasis role="bold">Warning:</emphasis> If the server dies
-          during a <literal>REPAIR TABLE</literal> operation, it is
-          essential after restarting it that you immediately execute
-          another <literal>REPAIR TABLE</literal> statement for the
-          table before performing any other operations on it. (It is
-          always a good idea to start by making a backup.) In the worst
-          case, you might have a new clean index file without
-          information about the data file, and then the next operation
-          you perform could overwrite the data file. This is an unlikely
-          but possible scenario.
-        </para>
-
       </section>
 
       <section id="restore-table">
@@ -12251,11 +12290,12 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Restores the table or tables from a backup that was made with
-          <literal>BACKUP TABLE</literal>. Existing tables are not
-          overwritten; if you try to restore over an existing table, you
-          get an error. Just as <literal>BACKUP TABLE</literal>,
-          <literal>RESTORE TABLE</literal> currently works only for
+          <literal>RESTORE TABLE</literal> restores the table or tables
+          from a backup that was made with <literal>BACKUP
+          TABLE</literal>. Existing tables are not overwritten; if you
+          try to restore over an existing table, an error occurs. Just
+          as for <literal>BACKUP TABLE</literal>, <literal>RESTORE
+          TABLE</literal> currently works only for
           <literal>MyISAM</literal> tables. The directory should be
           specified as a full pathname.
         </para>
@@ -12273,7 +12313,8 @@
         <remark role="help-description-end"/>
 
         <para>
-          The statement returns a table with the following columns:
+          <literal>RESTORE TABLE</literal> returns a result set with the
+          following columns:
         </para>
 
         <informaltable>
@@ -12852,7 +12893,7 @@
 <programlisting>
 mysql> <userinput>SET ONE_SHOT max_allowed_packet = 1;</userinput>
 ERROR 1382 (HY000): The 'SET ONE_SHOT' syntax is reserved for purposes
-internal to the MySQL server 
+internal to the MySQL server
 </programlisting>
 
           <para>
@@ -13359,7 +13400,7 @@
 
         <para>
           The <literal>Maxlen</literal> column shows the maximum number
-          of bytes used to store one character.
+          of bytes required to store one character.
         </para>
 
         <remark role="help-description-end"/>
@@ -13540,7 +13581,7 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Shows a <literal>CREATE DATABASE</literal> statement that
+          Shows the <literal>CREATE DATABASE</literal> statement that
           creates the given database. It was added in MySQL 4.1.
         </para>
 
@@ -13558,6 +13599,13 @@
 
         <remark role="help-example-end"/>
 
+        <para>
+          <literal>SHOW CREATE DATABASE</literal> quotes table and
+          column names according to the value of the
+          <literal>SQL_QUOTE_SHOW_CREATE</literal> option. See
+          <xref linkend="set-option"/>.
+        </para>
+
       </section>
 
       <section id="show-create-table">
@@ -13583,8 +13631,8 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Shows a <literal>CREATE TABLE</literal> statement that creates
-          the given table. It was added in MySQL 3.23.20.
+          Shows the <literal>CREATE TABLE</literal> statement that
+          creates the given table. It was added in MySQL 3.23.20.
         </para>
 
         <remark role="help-description-end"/>
@@ -13642,11 +13690,11 @@
 
         <para>
           <literal>SHOW DATABASES</literal> lists the databases on the
-          MySQL server host. You can also get this list using the
-          <command>mysqlshow</command> command. As of MySQL 4.0.2, you
-          see only those databases for which you have some kind of
-          privilege, if you do not have the global <literal>SHOW
-          DATABASES</literal> privilege.
+          MySQL server host. As of MySQL 4.0.2, you see only those
+          databases for which you have some kind of privilege, if you do
+          not have the global <literal>SHOW DATABASES</literal>
+          privilege. You can also get this list using the
+          <command>mysqlshow</command> command.
         </para>
 
         <para>
@@ -15229,13 +15277,13 @@
 | Created_tmp_disk_tables  | 0          |
 | Created_tmp_tables       | 8340       |
 | Created_tmp_files        | 60         |
-...                       ...          ...
+...
 | Open_tables              | 1          |
 | Open_files               | 2          |
 | Open_streams             | 0          |
 | Opened_tables            | 44600      |
 | Questions                | 2026873    |
-...                       ...          ...
+...
 | Table_locks_immediate    | 1920382    |
 | Table_locks_waited       | 0          |
 | Threads_cached           | 0          |
@@ -17290,7 +17338,7 @@
 
           <listitem>
             <para>
-              It works only with <literal>MyISAM</literal> tables.
+              It works only for <literal>MyISAM</literal> tables.
               Attempting to load a non-<literal>MyISAM</literal> table
               results in the following error:
             </para>

Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-5.0/client-utility-programs.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -6561,7 +6561,9 @@
           <literal>OPTIMIZE TABLE</literal> in a convenient way for the
           user. It determines which statements to use for the operation
           you want to perform, and then sends the statements to the
-          server to be executed.
+          server to be executed. For details about which storage engines
+          each statement works with, see the descriptions for those
+          statements in <xref linkend="sql-syntax"/>.
         </para>
 
         <para>

Modified: trunk/refman-5.0/connector-odbc.xml
===================================================================
--- trunk/refman-5.0/connector-odbc.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-5.0/connector-odbc.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -1450,10 +1450,10 @@
 
       <para>
         In case while configuring with thread-safe option, and gotten
-        into a configure error; then look at the
-        <filename>config.log</filename> and see whether it is due to the
-        lack of thread-libraries in the system; and supply one with LIBS
-        options i.e.
+        into a configure error, look at the
+        <filename>config.log</filename> and determine whether the error
+        is due to the lack of thread-libraries in the system; and supply
+        one with LIBS options i.e.
       </para>
 
 <programlisting>
@@ -1888,10 +1888,10 @@
 
       <para>
         Once the driver is built, cross-check its attributes using
-        <command>chatr .libs/libmyodbc3.sl</command> to see whether or
-        not you need to have the MySQL client libraries path using the
-        <literal>SHLIB_PATH</literal> environment variable. For static
-        versions, ignore all shared-library options and run
+        <command>chatr .libs/libmyodbc3.sl</command> to determine
+        whether you need to have the MySQL client libraries path using
+        the <literal>SHLIB_PATH</literal> environment variable. For
+        static versions, ignore all shared-library options and run
         <command>configure</command> with the
         <option>--disable-shared</option> option.
       </para>

Modified: trunk/refman-5.0/database-administration.xml
===================================================================
--- trunk/refman-5.0/database-administration.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-5.0/database-administration.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -12042,8 +12042,8 @@
             processlist</command> and <literal>SHOW
             PROCESSLIST</literal> shows the text of any statements
             currently being executed, so any user who is allowed to see
-            the server process list might be able to see whether another
-            user issues a statement such as <literal>UPDATE user SET
+            the server process list might be able to see statements
+            issued by other users such as <literal>UPDATE user SET
             password=PASSWORD('not_secure')</literal>.
           </para>
 
@@ -12657,10 +12657,10 @@
         <listitem>
           <para>
             Stage 2: Assuming that you can connect, the server checks
-            each statement you issue to see whether you have sufficient
-            privileges to perform it. For example, if you try to select
-            rows from a table in a database or drop a table from the
-            database, the server verifies that you have the
+            each statement you issue to determine whether you have
+            sufficient privileges to perform it. For example, if you try
+            to select rows from a table in a database or drop a table
+            from the database, the server verifies that you have the
             <literal>SELECT</literal> privilege for the table or the
             <literal>DROP</literal> privilege for the database.
           </para>

Modified: trunk/refman-5.0/installing.xml
===================================================================
--- trunk/refman-5.0/installing.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-5.0/installing.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -803,8 +803,8 @@
 
             <para>
               This suite runs a range of common queries. It is also a
-              test to see whether the latest batch of optimizations
-              actually made the code faster. See
+              test to determine whether the latest batch of
+              optimizations actually made the code faster. See
               <xref linkend="mysql-benchmarks"/>.
             </para>
           </listitem>
@@ -7125,10 +7125,10 @@
     </remark>
 
     <para>
-      Before you proceed with the source installation, check first to
-      see whether our binary is available for your platform and whether
-      it works for you. We put a lot of effort into making sure that our
-      binaries are built with the best possible options.
+      Before you proceed with the source installation, first check
+      whether our binary is available for your platform and whether it
+      works for you. We put a great deal of effort into ensuring that
+      our binaries are built with the best possible options.
     </para>
 
     <para>
@@ -13238,9 +13238,9 @@
           for setups with a lot of concurrent connections or tables
           exceeding the 2GB limit, our binary is the best choice in most
           cases. After reading the following text, if you are in doubt
-          about what to do, try our binary first to see whether it meets
-          your needs. If you discover that it is not good enough, you
-          may want to try your own build. In that case, we would
+          about what to do, try our binary first to determine whether it
+          meets your needs. If you discover that it is not good enough,
+          you may want to try your own build. In that case, we would
           appreciate a note about it so that we can build a better
           binary next time.
         </para>
@@ -15903,8 +15903,8 @@
             <para>
               Many applications use setuid binaries so that you need to
               specify only a single user. See the documentation provided
-              with the application to see whether this is the case for
-              your application.
+              with the application to determine whether this is the case
+              for your application.
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -120,8 +120,6 @@
       <para>
         The <literal>CHARACTER SET</literal> clause changes the default
         database character set. The <literal>COLLATE</literal> clause
-        changes the default database collation. Character set and
-        collation names are discussed in <xref linkend="charset"/>.
         changes the default database collation.
         <xref linkend="charset"/>, discusses character set and collation
         names.
@@ -1575,27 +1573,27 @@
         Commenting this out, not sure how (or even if) it applies in 5.0
         Check this against what applies to 5.0 for TIMESTAMP columns.
       </remark>
-      
+
       <para>
         <literal>NULL</literal> values are handled differently for
-        <literal>TIMESTAMP</literal> columns than for other column 
-        types. Before MySQL 4.1.6, you cannot store a literal 
-        <literal>NULL</literal> in a <literal>TIMESTAMP</literal> 
-        column; setting the column to <literal>NULL</literal> sets it to 
-        the current date and time. Because <literal>TIMESTAMP</literal> 
-        columns behave this way, the <literal>NULL</literal> and 
-        <literal>NOT NULL</literal> attributes do not apply in the 
-        normal way and are ignored if you specify them. On the other 
-        hand, to make it easier for MySQL clients to use 
-        <literal>TIMESTAMP</literal> columns, the server reports that 
-        such columns can be assigned <literal>NULL</literal> values 
-        (which is true), even though <literal>TIMESTAMP</literal> never 
-        actually contains a <literal>NULL</literal> value. You can see 
-        this when you use <literal>DESCRIBE 
-        <replaceable>tbl_name</replaceable></literal> to get a 
+        <literal>TIMESTAMP</literal> columns than for other column
+        types. Before MySQL 4.1.6, you cannot store a literal
+        <literal>NULL</literal> in a <literal>TIMESTAMP</literal>
+        column; setting the column to <literal>NULL</literal> sets it to
+        the current date and time. Because <literal>TIMESTAMP</literal>
+        columns behave this way, the <literal>NULL</literal> and
+        <literal>NOT NULL</literal> attributes do not apply in the
+        normal way and are ignored if you specify them. On the other
+        hand, to make it easier for MySQL clients to use
+        <literal>TIMESTAMP</literal> columns, the server reports that
+        such columns can be assigned <literal>NULL</literal> values
+        (which is true), even though <literal>TIMESTAMP</literal> never
+        actually contains a <literal>NULL</literal> value. You can see
+        this when you use <literal>DESCRIBE
+        <replaceable>tbl_name</replaceable></literal> to get a
         description of your table.
       </para>
-      
+
       <para>
         Note that setting a <literal>TIMESTAMP</literal> column to
         <literal>0</literal> is not the same as setting it to
@@ -1629,8 +1627,9 @@
 
           <para>
             If a column definition includes no explicit
-            <literal>DEFAULT</literal> value, MySQL determines default
-            value as described in <xref linkend="data-type-defaults"/>.
+            <literal>DEFAULT</literal> value, MySQL determines the
+            default value as described in
+            <xref linkend="data-type-defaults"/>.
           </para>
 
           <para>
@@ -9108,26 +9107,26 @@
           parse error.
         </remark>
 
-<!--       
+<!--
        <para>
          For more complicated subqueries, you can often create temporary
-         tables to hold the subquery. In some cases, however, this 
-         option does not work. The most frequently encountered of these 
-         cases arises with <literal>DELETE</literal> statements, for 
-         which standard SQL does not support joins (except in 
-         subqueries). For this situation, there are three options 
+         tables to hold the subquery. In some cases, however, this
+         option does not work. The most frequently encountered of these
+         cases arises with <literal>DELETE</literal> statements, for
+         which standard SQL does not support joins (except in
+         subqueries). For this situation, there are three options
          available:
        </para>
-       
+
        <itemizedlist>
-         
+
          <listitem>
            <para>
              The first option is to upgrade to MySQL 4.1, which does support
              subqueries in <literal>DELETE</literal> statements.
            </para>
          </listitem>
-         
+
          <listitem><para>
              The second option is to use a procedural programming language
              (such as Perl or PHP) to submit a <literal>SELECT</literal> query
@@ -9136,32 +9135,32 @@
              statement (<literal>DELETE FROM ... WHERE key_col IN (key1, key2,
                ...)</literal>).
            </para></listitem>
-         
+
          <listitem><para>
              The third option is to use interactive SQL to construct a set of
              <literal>DELETE</literal> statements automatically, using the
              MySQL extension <literal>CONCAT()</literal> (in lieu of the
              standard <literal>||</literal> operator). For example:
            </para>
-           
+
            <programlisting>
              SELECT
              CONCAT('DELETE FROM tab1 WHERE pkid = ', "'", tab1.pkid, "'", ';')
              FROM tab1, tab2
              WHERE tab1.col1 = tab2.col2;
 </programlisting>
-           
+
            <para>
              You can place this query in a script file, use the file as input
              to one instance of the <command>mysql</command> program, and use
              the program output as input to a second instance of
              <command>mysql</command>:
            </para>
-           
+
            <programlisting>
              shell&gt; mysql - -skip-column-names mydb &lt; myscript.sql | mysql mydb
 </programlisting>
-         
+
        </itemizedlist>
 -->
 
@@ -12448,28 +12447,12 @@
               columns are set to their implicit default values if strict
               SQL mode is not enabled. In strict mode, the statement is
               rejected if any of the omitted columns have no default
-              value. <xref linkend="server-sql-mode"/>, discusses strict
-              mode. <xref linkend="create-table"/>, discusses implicit
+              value. (Standard SQL requires you to have the
+              <literal>INSERT</literal> privilege on all columns.)
+              <xref linkend="server-sql-mode"/>, discusses strict mode.
+              <xref linkend="data-type-defaults"/>, discusses implicit
               default values.
             </para>
-
-            <para>
-              The columns for which you don't have the
-              <literal>INSERT</literal> privilege are set to their
-              default values. Standard SQL requires you to have the
-              <literal>INSERT</literal> privilege on all columns.
-            </para>
-
-            <para>
-              In MySQL, if you have the INSERT privilege on only some of
-              the columns in a table, you can still execute INSERT
-              statements on the table &mdash; provided you omit the
-              columns on which you do not have the privilege from your
-              INSERT statement; those columns will be set to their
-              default values. Under strict mode (i.e. when
-              sql_mode='traditional', if any of the omitted columns have
-              no default value, the INSERT statement will be rejected.
-            </para>
           </listitem>
 
         </itemizedlist>
@@ -12574,7 +12557,7 @@
 
         <para>
           The second syntax sets the password for a specific account on
-          the current server host. Only clients with the
+          the current server host. Only clients that have the
           <literal>UPDATE</literal> privilege for the
           <literal>mysql</literal> database can do this. The
           <replaceable>user</replaceable> value should be given in
@@ -12591,7 +12574,7 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SET PASSWORD FOR 'bob'@'%.loc.gov' = PASSWORD('<replaceable>newpass</replaceable>');</userinput>
+SET PASSWORD FOR 'bob'@'%.loc.gov' = PASSWORD('<replaceable>newpass</replaceable>');
 </programlisting>
 
         <remark role="help-description-end"/>
@@ -12601,9 +12584,9 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>UPDATE mysql.user SET Password=PASSWORD('<replaceable>newpass</replaceable>')</userinput>
-    -&gt; <userinput>WHERE User='bob' AND Host='%.loc.gov';</userinput>
-mysql&gt; <userinput>FLUSH PRIVILEGES;</userinput>
+UPDATE mysql.user SET Password=PASSWORD('<replaceable>newpass</replaceable>')
+  WHERE User='bob' AND Host='%.loc.gov';
+FLUSH PRIVILEGES;
 </programlisting>
 
         <para>
@@ -12618,9 +12601,8 @@
         </para>
 
         <para>
-          You can see what your current authentication
-          <literal>user@host</literal> entry is by executing
-          <literal>SELECT CURRENT_USER()</literal>.
+          You can see which account the server authenticated you as by
+          executing <literal>SELECT CURRENT_USER()</literal>.
         </para>
 
       </section>
@@ -12654,12 +12636,13 @@
         <remark role="help-description-begin"/>
 
         <para>
-          This statement analyzes and stores the key distribution for a
-          table. During the analysis, the table is locked with a read
-          lock. This works with <literal>MyISAM</literal>,
-          <literal>BDB</literal>, and <literal>InnoDB</literal> tables.
-          For <literal>MyISAM</literal> tables, this statement is
-          equivalent to using <command>myisamchk -a</command>.
+          <literal>ANALYZE TABLE</literal> analyzes and stores the key
+          distribution for a table. During the analysis, the table is
+          locked with a read lock. This statement works with
+          <literal>MyISAM</literal>, <literal>BDB</literal>, and
+          <literal>InnoDB</literal> tables. For
+          <literal>MyISAM</literal> tables, this statement is equivalent
+          to using <command>myisamchk -a</command>.
         </para>
 
         <para>
@@ -12671,7 +12654,8 @@
         <remark role="help-description-end"/>
 
         <para>
-          The statement returns a table with the following columns:
+          <literal>ANALYZE TABLE</literal> returns a result set with the
+          following columns:
         </para>
 
         <informaltable>
@@ -12770,27 +12754,24 @@
           <filename>.MYD</filename> data files. The
           <filename>.MYI</filename> index file can be rebuilt from those
           two files. The directory should be specified as a full
-          pathname.
+          pathname. To restore the table, use <literal>RESTORE
+          TABLE</literal>.
         </para>
 
         <remark role="help-description-end"/>
 
         <para>
-          Before using this statement, please see
-          <xref linkend="backup"/>.
-        </para>
-
-        <para>
           During the backup, a read lock is held for each table, one at
           time, as they are being backed up. If you want to back up
           several tables as a snapshot (preventing any of them from
-          being changed during the backup operation), you must first
-          issue a <literal>LOCK TABLES</literal> statement to obtain a
-          read lock for every table in the group.
+          being changed during the backup operation), issue a
+          <literal>LOCK TABLES</literal> statement first, to obtain a
+          read lock for all tables in the group.
         </para>
 
         <para>
-          The statement returns a table with the following columns:
+          <literal>BACKUP TABLE</literal> returns a result set with the
+          following columns:
         </para>
 
         <informaltable>
@@ -12850,11 +12831,11 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Checks a table or tables for errors. <literal>CHECK
-          TABLE</literal> works for <literal>MyISAM</literal> and
-          <literal>InnoDB</literal> tables. For
-          <literal>MyISAM</literal> tables, the key statistics are
-          updated.
+          <literal>CHECK TABLE</literal> checks a table or tables for
+          errors. <literal>CHECK TABLE</literal> works for
+          <literal>MyISAM</literal> and <literal>InnoDB</literal>
+          tables. For <literal>MyISAM</literal> tables, the key
+          statistics are updated as well.
         </para>
 
         <para>
@@ -12866,8 +12847,8 @@
         <remark role="help-description-end"/>
 
         <para>
-          The <literal>CHECK TABLE</literal> statement returns a table
-          with the following columns:
+          <literal>CHECK TABLE</literal> returns a result set with the
+          following columns:
         </para>
 
         <informaltable>
@@ -12975,9 +12956,9 @@
         </para>
 
         <para>
-          You can combine check options, as in the following example,
-          which does a quick check on the table to see whether it was
-          closed properly:
+          You can combine check options, as in the following example
+          that does a quick check on the table to determine whether it
+          was closed properly:
         </para>
 
 <programlisting>
@@ -13026,8 +13007,8 @@
         <para>
           <literal>EXTENDED</literal> is to be used only after you have
           run a normal check but still get strange errors from a table
-          when MySQL tries to update a row or find a row by key. (This
-          is very unlikely if a normal check has succeeded.)
+          when MySQL tries to update a row or find a row by key. This is
+          very unlikely if a normal check has succeeded.
         </para>
 
         <para>
@@ -13092,36 +13073,36 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Reports a table checksum.
+          <literal>CHECKSUM TABLE</literal> reports a table checksum.
         </para>
 
         <para>
-          If <literal>QUICK</literal> is specified, the live table
-          checksum is reported if it is available, or
-          <literal>NULL</literal> otherwise. This is very fast. A live
-          checksum is enabled by specifying the
-          <literal>CHECKSUM=1</literal> table option, currently
-          supported only for <literal>MyISAM</literal> tables. See
+          With <literal>QUICK</literal>, the live table checksum is
+          reported if it is available, or <literal>NULL</literal>
+          otherwise. This is very fast. A live checksum is enabled by
+          specifying the <literal>CHECKSUM=1</literal> table option when
+          you create the table; currently, this is supported only for
+          <literal>MyISAM</literal> tables. See
           <xref linkend="create-table"/>.
         </para>
 
         <para>
-          In <literal>EXTENDED</literal> mode the whole table is read
-          row by row and the checksum is calculated. This can be very
-          slow for large tables.
+          With <literal>EXTENDED</literal>, the entire table is read row
+          by row and the checksum is calculated. This can be very slow
+          for large tables.
         </para>
 
         <para>
-          By default, if neither <literal>QUICK</literal> nor
+          If neither <literal>QUICK</literal> nor
           <literal>EXTENDED</literal> is specified, MySQL returns a live
           checksum if the table storage engine supports it and scans the
           table otherwise.
         </para>
 
         <para>
-          <literal>CHECKSUM TABLE</literal> returns
-          <literal>NULL</literal> for non-existent tables. As of MySQL
-          5.0.3, a warning is generated for this condition.
+          For a non-existent table, <literal>CHECKSUM TABLE</literal>
+          returns <literal>NULL</literal> and, as of MySQL 5.0.3,
+          generates a warning.
         </para>
 
         <remark role="help-description-end"/>
@@ -13168,12 +13149,12 @@
           <literal>OPTIMIZE TABLE</literal> should be used if you have
           deleted a large part of a table or if you have made many
           changes to a table with variable-length rows (tables that have
-          <literal>VARCHAR</literal>, <literal>BLOB</literal>, or
-          <literal>TEXT</literal> columns). Deleted rows are maintained
-          in a linked list and subsequent <literal>INSERT</literal>
-          operations reuse old row positions. You can use
-          <literal>OPTIMIZE TABLE</literal> to reclaim the unused space
-          and to defragment the data file.
+          <literal>VARCHAR</literal>, <literal>VARBINARY</literal>,
+          <literal>BLOB</literal>, or <literal>TEXT</literal> columns).
+          Deleted rows are maintained in a linked list and subsequent
+          <literal>INSERT</literal> operations reuse old row positions.
+          You can use <literal>OPTIMIZE TABLE</literal> to reclaim the
+          unused space and to defragment the data file.
         </para>
 
         <remark role="help-description-end"/>
@@ -13187,7 +13168,7 @@
         </para>
 
         <para>
-          <literal>OPTIMIZE TABLE</literal> works only on
+          <literal>OPTIMIZE TABLE</literal> works only for
           <literal>MyISAM</literal>, <literal>BDB</literal>, and
           <literal>InnoDB</literal> tables.
         </para>
@@ -13224,22 +13205,60 @@
         <para>
           For <literal>BDB</literal> tables, <literal>OPTIMIZE
           TABLE</literal> currently is mapped to <literal>ANALYZE
-          TABLE</literal>. For <literal>InnoDB</literal> tables, it is
-          mapped to <literal>ALTER TABLE</literal>, which rebuilds the
-          table. Rebuilding updates index statistics and frees unused
-          space in the clustered index. See
-          <xref linkend="analyze-table"/>.
+          TABLE</literal>. See <xref linkend="analyze-table"/>.
         </para>
 
         <para>
+          For <literal>InnoDB</literal> tables, <literal>OPTIMIZE
+          TABLE</literal> is mapped to <literal>ALTER TABLE</literal>,
+          which rebuilds the table to update index statistics and free
+          unused space in the clustered index.
+        </para>
+
+        <para>
           You can make <literal>OPTIMIZE TABLE</literal> work on other
           storage engines by starting <command>mysqld</command> with the
           <option>--skip-new</option> or <option>--safe-mode</option>
-          option; in this case, <literal>OPTIMIZE TABLE</literal> is
+          option. In this case, <literal>OPTIMIZE TABLE</literal> is
           just mapped to <literal>ALTER TABLE</literal>.
         </para>
 
         <para>
+          <literal>OPTIMIZE TABLE</literal> returns a result set with
+          the following columns:
+        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <colspec colwidth="15*"/>
+            <colspec colwidth="60*"/>
+            <tbody>
+              <row>
+                <entry><emphasis role="bold">Column</emphasis></entry>
+                <entry><emphasis role="bold">Value</emphasis></entry>
+              </row>
+              <row>
+                <entry><literal>Table</literal></entry>
+                <entry>The table name</entry>
+              </row>
+              <row>
+                <entry><literal>Op</literal></entry>
+                <entry>Always <literal>optimize</literal></entry>
+              </row>
+              <row>
+                <entry><literal>Msg_type</literal></entry>
+                <entry>One of <literal>status</literal>, <literal>error</literal>,
+                  <literal>info</literal>, or <literal>warning</literal></entry>
+              </row>
+              <row>
+                <entry><literal>Msg_text</literal></entry>
+                <entry>The message</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+
+        <para>
           Note that MySQL locks the table during the time
           <literal>OPTIMIZE TABLE</literal> is running.
         </para>
@@ -13284,18 +13303,18 @@
           table. By default, it has the same effect as
           <command>myisamchk --recover
           <replaceable>tbl_name</replaceable></command>. <literal>REPAIR
-          TABLE</literal> works on <literal>MyISAM</literal> and on
+          TABLE</literal> works for <literal>MyISAM</literal> and for
           <literal>ARCHIVE</literal> tables. See
-          <xref linkend="myisam-storage-engine"/>,
+          <xref linkend="myisam-storage-engine"/>, and
           <xref linkend="archive-storage-engine"/>.
         </para>
 
         <remark role="help-description-end"/>
 
         <para>
-          Normally you should never have to run this statement. However,
-          if disaster strikes, <literal>REPAIR TABLE</literal> is very
-          likely to get back all your data from a
+          Normally, you should never have to run this statement.
+          However, if disaster strikes, <literal>REPAIR TABLE</literal>
+          is very likely to get back all your data from a
           <literal>MyISAM</literal> table. If your tables become
           corrupted often, you should try to find the reason for it, to
           eliminate the need to use <literal>REPAIR TABLE</literal>. See
@@ -13304,9 +13323,23 @@
         </para>
 
         <para>
-          This statement returns a table with the following columns:
+          <emphasis role="bold">Warning:</emphasis> If the server dies
+          during a <literal>REPAIR TABLE</literal> operation, it is
+          essential after restarting it that you immediately execute
+          another <literal>REPAIR TABLE</literal> statement for the
+          table before performing any other operations on it. (It is
+          always a good idea to start by making a backup.) In the worst
+          case, you might have a new clean index file without
+          information about the data file, and then the next operation
+          you perform could overwrite the data file. This is an unlikely
+          but possible scenario.
         </para>
 
+        <para>
+          <literal>REPAIR TABLE</literal> returns a result set with the
+          following columns:
+        </para>
+
         <informaltable>
           <tgroup cols="2">
             <colspec colwidth="15*"/>
@@ -13344,10 +13377,10 @@
           <literal>status</literal> and <literal>Msg_test</literal>
           normally should be <literal>OK</literal>. If you do not get
           <literal>OK</literal>, you should try repairing the table with
-          <command>myisamchk --safe-recover</command>, because
-          <literal>REPAIR TABLE</literal> does not yet implement all the
-          options of <command>myisamchk</command>. We plan to make it
-          more flexible in the future.
+          <command>myisamchk --safe-recover</command>. (<literal>REPAIR
+          TABLE</literal> does not yet implement all the options of
+          <command>myisamchk</command>. We plan to make it more flexible
+          in the future.)
         </para>
 
         <para>
@@ -13372,17 +13405,15 @@
           <filename>.MYI</filename> file using information from the
           <filename>.frm</filename> file. This kind of repair cannot be
           done with <command>myisamchk</command>.
-          <emphasis
-            role="bold">Note</emphasis>: Use this
-          mode <emphasis
-              role="bold">only</emphasis> if
-          you cannot use regular <literal>REPAIR</literal> modes.
-          <filename>.MYI</filename> header contains important table
-          metadata (in particular, current
-          <literal>AUTO_INCREMENT</literal> value and <literal>Delete
-          link</literal>) that are lost in <literal>REPAIR ...
-          USE_FRM</literal>. Don't use <literal>USE_FRM</literal> if the
-          table is compressed, as this information is also stored in the
+          <emphasis role="bold">Note</emphasis>: Use this mode
+          <emphasis>only</emphasis> if you cannot use regular
+          <literal>REPAIR</literal> modes. <filename>.MYI</filename>
+          header contains important table metadata (in particular,
+          current <literal>AUTO_INCREMENT</literal> value and
+          <literal>Delete link</literal>) that are lost in
+          <literal>REPAIR ... USE_FRM</literal>. Don't use
+          <literal>USE_FRM</literal> if the table is compressed because
+          this information is also stored in the
           <filename>.MYI</filename> file.
         </para>
 
@@ -13396,19 +13427,6 @@
           default to the replication slave.
         </para>
 
-        <para>
-          <emphasis role="bold">Warning:</emphasis> If the server dies
-          during a <literal>REPAIR TABLE</literal> operation, it is
-          essential after restarting it that you immediately execute
-          another <literal>REPAIR TABLE</literal> statement for the
-          table before performing any other operations on it. (It is
-          always a good idea to start by making a backup.) In the worst
-          case, you might have a new clean index file without
-          information about the data file, and then the next operation
-          you perform could overwrite the data file. This is an unlikely
-          but possible scenario.
-        </para>
-
       </section>
 
       <section id="restore-table">
@@ -13430,11 +13448,12 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Restores the table or tables from a backup that was made with
-          <literal>BACKUP TABLE</literal>. Existing tables are not
-          overwritten; if you try to restore over an existing table, you
-          get an error. Just as <literal>BACKUP TABLE</literal>,
-          <literal>RESTORE TABLE</literal> currently works only for
+          <literal>RESTORE TABLE</literal> restores the table or tables
+          from a backup that was made with <literal>BACKUP
+          TABLE</literal>. Existing tables are not overwritten; if you
+          try to restore over an existing table, an error occurs. Just
+          as for <literal>BACKUP TABLE</literal>, <literal>RESTORE
+          TABLE</literal> currently works only for
           <literal>MyISAM</literal> tables. The directory should be
           specified as a full pathname.
         </para>
@@ -13452,7 +13471,8 @@
         <remark role="help-description-end"/>
 
         <para>
-          The statement returns a table with the following columns:
+          <literal>RESTORE TABLE</literal> returns a result set with the
+          following columns:
         </para>
 
         <informaltable>
@@ -13905,18 +13925,18 @@
 <!--
         <listitem>
           <remark>NOT YET IMPLEMENTED:</remark>
-          
+
           <para>
-            <literal>DATE_FORMAT = 
+            <literal>DATE_FORMAT =
               <replaceable>format_str</replaceable></literal>
           </para>
-          
+
           <para>
-            Determines how the server converts <literal>DATE</literal> 
-            values to strings. This variable is available as a global, 
-            local, or command-line option. 
-            <replaceable>format_str</replaceable> can be specified 
-            conveniently using the <literal>GET_FORMAT()</literal> 
+            Determines how the server converts <literal>DATE</literal>
+            values to strings. This variable is available as a global,
+            local, or command-line option.
+            <replaceable>format_str</replaceable> can be specified
+            conveniently using the <literal>GET_FORMAT()</literal>
             function. See <xref linkend="date-and-time-functions"/>.
           </para>
         </listitem>
@@ -13925,18 +13945,18 @@
 <!--
         <listitem>
           <remark>NOT YET IMPLEMENTED:</remark>
-          
+
           <para>
-            <literal>DATETIME_FORMAT = 
+            <literal>DATETIME_FORMAT =
               <replaceable>format_str</replaceable></literal>
           </para>
-          
+
           <para>
-            Determines how the server converts 
-            <literal>DATETIME</literal> values to strings. This variable 
-            is available as a global, local, or command-line option. 
-            <replaceable>format_str</replaceable> can be specified 
-            conveniently using the <literal>GET_FORMAT()</literal> 
+            Determines how the server converts
+            <literal>DATETIME</literal> values to strings. This variable
+            is available as a global, local, or command-line option.
+            <replaceable>format_str</replaceable> can be specified
+            conveniently using the <literal>GET_FORMAT()</literal>
             function. See <xref linkend="date-and-time-functions"/>.
           </para>
         </listitem>
@@ -14064,7 +14084,7 @@
 <programlisting>
 mysql> <userinput>SET ONE_SHOT max_allowed_packet = 1;</userinput>
 ERROR 1382 (HY000): The 'SET ONE_SHOT' syntax is reserved for purposes
-internal to the MySQL server 
+internal to the MySQL server
 </programlisting>
 
           <para>
@@ -14310,18 +14330,18 @@
 <!--
         <listitem>
           <remark>NOT YET IMPLEMENTED:</remark>
-          
+
           <para>
-            <literal>TIME_FORMAT = 
+            <literal>TIME_FORMAT =
               <replaceable>format_str</replaceable></literal>
           </para>
-          
+
           <para>
-            Determines how the server converts <literal>TIME</literal> 
-            values to strings. This variable is available as a global, 
-            local, or command-line option. 
-            <replaceable>format_str</replaceable> can be specified 
-            conveniently using the <literal>GET_FORMAT()</literal> 
+            Determines how the server converts <literal>TIME</literal>
+            values to strings. This variable is available as a global,
+            local, or command-line option.
+            <replaceable>format_str</replaceable> can be specified
+            conveniently using the <literal>GET_FORMAT()</literal>
             function. See <xref linkend="date-and-time-functions"/>.
           </para>
         </listitem>
@@ -14606,7 +14626,7 @@
 
         <para>
           The <literal>Maxlen</literal> column shows the maximum number
-          of bytes used to store one character.
+          of bytes required to store one character.
         </para>
 
       </section>
@@ -14779,9 +14799,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Shows a <literal>CREATE DATABASE</literal> statement that
+          Shows the <literal>CREATE DATABASE</literal> statement that
           creates the given database. <literal>SHOW CREATE
-          SCHEMA</literal> can be used as of MySQL 5.0.2.
+          SCHEMA</literal> is a synonym for <literal>SHOW CREATE
+          DATABASE</literal> as of MySQL 5.0.2.
         </para>
 
         <remark role="help-description-end"/>
@@ -14804,6 +14825,13 @@
 
         <remark role="help-example-end"/>
 
+        <para>
+          <literal>SHOW CREATE DATABASE</literal> quotes table and
+          column names according to the value of the
+          <literal>SQL_QUOTE_SHOW_CREATE</literal> option. See
+          <xref linkend="set-option"/>.
+        </para>
+
       </section>
 
       <section id="show-create-table">
@@ -14829,9 +14857,9 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Shows a <literal>CREATE TABLE</literal> statement that creates
-          the given table. As of MySQL 5.0.1, this statement also works
-          with views.
+          Shows the <literal>CREATE TABLE</literal> statement that
+          creates the given table. As of MySQL 5.0.1, this statement
+          also works with views.
         </para>
 
         <remark role="help-description-end"/>
@@ -14893,11 +14921,10 @@
 
         <para>
           <literal>SHOW DATABASES</literal> lists the databases on the
-          MySQL server host. You can also get this list using the
-          <command>mysqlshow</command> command. You see only those
-          databases for which you have some kind of privilege, unless
-          you have the global <literal>SHOW DATABASES</literal>
-          privilege.
+          MySQL server host. You see only those databases for which you
+          have some kind of privilege, unless you have the global
+          <literal>SHOW DATABASES</literal> privilege. You can also get
+          this list using the <command>mysqlshow</command> command.
         </para>
 
         <para>
@@ -16446,13 +16473,13 @@
 | Created_tmp_disk_tables  | 0          |
 | Created_tmp_tables       | 8340       |
 | Created_tmp_files        | 60         |
-...                       ...          ...
+...
 | Open_tables              | 1          |
 | Open_files               | 2          |
 | Open_streams             | 0          |
 | Opened_tables            | 44600      |
 | Questions                | 2026873    |
-...                       ...          ...
+...
 | Table_locks_immediate    | 1920382    |
 | Table_locks_waited       | 0          |
 | Threads_cached           | 0          |
@@ -16897,7 +16924,7 @@
 Statement: SET @sum = @sum + NEW.amount
    Timing: BEFORE
   Created: NULL
- sql_mode: 
+ sql_mode:
   Definer: myname@localhost
 </programlisting>
 
@@ -17092,9 +17119,9 @@
 
 <programlisting>
 mysql&gt; <userinput>SHOW VARIABLES;</userinput>
-+---------------------------------+-------------------------------------+   
++---------------------------------+-------------------------------------+
 | Variable_name                   | Value                               |
-+---------------------------------+-------------------------------------+   
++---------------------------------+-------------------------------------+
 | auto_increment_increment        | 1                                   |
 | auto_increment_offset           | 1                                   |
 | automatic_sp_privileges         | ON                                  |
@@ -17103,7 +17130,7 @@
 | bdb_cache_size                  | 8388600                             |
 | bdb_home                        | /var/lib/mysql/                     |
 | bdb_log_buffer_size             | 32768                               |
-...                               ...                                                       ...    
+...
 | max_connections                 | 100                                 |
 | max_connect_errors              | 10                                  |
 | max_delayed_threads             | 20                                  |
@@ -17112,7 +17139,7 @@
 | max_join_size                   | 4294967295                          |
 | max_relay_log_size              | 0                                   |
 | max_sort_length                 | 1024                                |
-...                               ...                                                       ...    
+...
 | time_zone                       | SYSTEM                              |
 | timed_mutexes                   | OFF                                 |
 | tmp_table_size                  | 33554432                            |
@@ -17126,7 +17153,7 @@
 | version_compile_machine         | i686                                |
 | version_compile_os              | pc-linux-gnu                        |
 | wait_timeout                    | 28800                               |
-+---------------------------------+-------------------------------------+   
++---------------------------------+-------------------------------------+
 </programlisting>
 
         <para>
@@ -17160,7 +17187,7 @@
 | have_raid             | NO       |
 | have_rtree_keys       | YES      |
 | have_symlink          | YES      |
-+-----------------------+----------+ 
++-----------------------+----------+
 </programlisting>
 
       </section>
@@ -18750,7 +18777,7 @@
 
           <listitem>
             <para>
-              It works only with <literal>MyISAM</literal> tables.
+              It works only for <literal>MyISAM</literal> tables.
               Attempting to load a non-<literal>MyISAM</literal> table
               results in the following error:
             </para>

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -6587,7 +6587,9 @@
           <literal>OPTIMIZE TABLE</literal> in a convenient way for the
           user. It determines which statements to use for the operation
           you want to perform, and then sends the statements to the
-          server to be executed.
+          server to be executed. For details about which storage engines
+          each statement works with, see the descriptions for those
+          statements in <xref linkend="sql-syntax"/>.
         </para>
 
         <para>

Modified: trunk/refman-5.1/connector-odbc.xml
===================================================================
--- trunk/refman-5.1/connector-odbc.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-5.1/connector-odbc.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -1450,10 +1450,10 @@
 
       <para>
         In case while configuring with thread-safe option, and gotten
-        into a configure error; then look at the
-        <filename>config.log</filename> and see whether it is due to the
-        lack of thread-libraries in the system; and supply one with LIBS
-        options i.e.
+        into a configure error, look at the
+        <filename>config.log</filename> and determine whether the error
+        is due to the lack of thread-libraries in the system; and supply
+        one with LIBS options i.e.
       </para>
 
 <programlisting>
@@ -1888,10 +1888,10 @@
 
       <para>
         Once the driver is built, cross-check its attributes using
-        <command>chatr .libs/libmyodbc3.sl</command> to see whether or
-        not you need to have the MySQL client libraries path using the
-        <literal>SHLIB_PATH</literal> environment variable. For static
-        versions, ignore all shared-library options and run
+        <command>chatr .libs/libmyodbc3.sl</command> to determine
+        whether you need to have the MySQL client libraries path using
+        the <literal>SHLIB_PATH</literal> environment variable. For
+        static versions, ignore all shared-library options and run
         <command>configure</command> with the
         <option>--disable-shared</option> option.
       </para>

Modified: trunk/refman-5.1/database-administration.xml
===================================================================
--- trunk/refman-5.1/database-administration.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-5.1/database-administration.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -12084,8 +12084,8 @@
             processlist</command> and <literal>SHOW
             PROCESSLIST</literal> shows the text of any statements
             currently being executed, so any user who is allowed to see
-            the server process list might be able to see whether another
-            user issues a statement such as <literal>UPDATE user SET
+            the server process list might be able to see statements
+            issued by other users such as <literal>UPDATE user SET
             password=PASSWORD('not_secure')</literal>.
           </para>
 
@@ -12698,10 +12698,10 @@
         <listitem>
           <para>
             Stage 2: Assuming that you can connect, the server checks
-            each statement you issue to see whether you have sufficient
-            privileges to perform it. For example, if you try to select
-            rows from a table in a database or drop a table from the
-            database, the server verifies that you have the
+            each statement you issue to determine whether you have
+            sufficient privileges to perform it. For example, if you try
+            to select rows from a table in a database or drop a table
+            from the database, the server verifies that you have the
             <literal>SELECT</literal> privilege for the table or the
             <literal>DROP</literal> privilege for the database.
           </para>

Modified: trunk/refman-5.1/installing.xml
===================================================================
--- trunk/refman-5.1/installing.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-5.1/installing.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -803,8 +803,8 @@
 
             <para>
               This suite runs a range of common queries. It is also a
-              test to see whether the latest batch of optimizations
-              actually made the code faster. See
+              test to determine whether the latest batch of
+              optimizations actually made the code faster. See
               <xref linkend="mysql-benchmarks"/>.
             </para>
           </listitem>
@@ -7121,10 +7121,10 @@
     </remark>
 
     <para>
-      Before you proceed with the source installation, check first to
-      see whether our binary is available for your platform and whether
-      it works for you. We put a lot of effort into making sure that our
-      binaries are built with the best possible options.
+      Before you proceed with the source installation, first check
+      whether our binary is available for your platform and whether it
+      works for you. We put a great deal of effort into ensuring that
+      our binaries are built with the best possible options.
     </para>
 
     <para>
@@ -12667,9 +12667,9 @@
           for setups with a lot of concurrent connections or tables
           exceeding the 2GB limit, our binary is the best choice in most
           cases. After reading the following text, if you are in doubt
-          about what to do, try our binary first to see whether it meets
-          your needs. If you discover that it is not good enough, you
-          may want to try your own build. In that case, we would
+          about what to do, try our binary first to determine whether it
+          meets your needs. If you discover that it is not good enough,
+          you may want to try your own build. In that case, we would
           appreciate a note about it so that we can build a better
           binary next time.
         </para>
@@ -15332,8 +15332,8 @@
             <para>
               Many applications use setuid binaries so that you need to
               specify only a single user. See the documentation provided
-              with the application to see whether this is the case for
-              your application.
+              with the application to determine whether this is the case
+              for your application.
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-28 19:12:41 UTC (rev 1078)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-28 19:13:01 UTC (rev 1079)
@@ -127,8 +127,7 @@
 
       <para>
         The database name can be omitted, in which case the statement
-        applies to the default database. <literal>ALTER SCHEMA</literal>
-        can be also used.
+        applies to the default database.
       </para>
 
       <remark role="help-description-end"/>
@@ -815,7 +814,7 @@
     PARTITION p0 VALUES LESS THAN (1991),
     PARTITION p1 VALUES LESS THAN (1995),
     PARTITION p2 VALUES LESS THAN (1999)
-);    
+);
 </programlisting>
 
           <para>
@@ -1577,7 +1576,7 @@
     [  SUBPARTITION BY
            [LINEAR] HASH(<replaceable>expr</replaceable>)
          | [LINEAR] KEY(<replaceable>column_list</replaceable>)
-      [SUBPARTITIONS <replaceable>num</replaceable>]  
+      [SUBPARTITIONS <replaceable>num</replaceable>]
     ]
     [(<replaceable>partition_definition</replaceable>) [, (<replaceable>partition_definition</replaceable>)] ...]
 
@@ -1830,27 +1829,27 @@
         Commenting this out, not sure how (or even if) it applies in 5.1
         Check this against what applies to 5.1 for TIMESTAMP columns.
       </remark>
-      
+
       <para>
         <literal>NULL</literal> values are handled differently for
-        <literal>TIMESTAMP</literal> columns than for other column 
-        types. Before MySQL 4.1.6, you cannot store a literal 
-        <literal>NULL</literal> in a <literal>TIMESTAMP</literal> 
-        column; setting the column to <literal>NULL</literal> sets it to 
-        the current date and time. Because <literal>TIMESTAMP</literal> 
-        columns behave this way, the <literal>NULL</literal> and 
-        <literal>NOT NULL</literal> attributes do not apply in the 
-        normal way and are ignored if you specify them. On the other 
-        hand, to make it easier for MySQL clients to use 
-        <literal>TIMESTAMP</literal> columns, the server reports that 
-        such columns can be assigned <literal>NULL</literal> values 
-        (which is true), even though <literal>TIMESTAMP</literal> never 
-        actually contains a <literal>NULL</literal> value. You can see 
-        this when you use <literal>DESCRIBE 
-        <replaceable>tbl_name</replaceable></literal> to get a 
+        <literal>TIMESTAMP</literal> columns than for other column
+        types. Before MySQL 4.1.6, you cannot store a literal
+        <literal>NULL</literal> in a <literal>TIMESTAMP</literal>
+        column; setting the column to <literal>NULL</literal> sets it to
+        the current date and time. Because <literal>TIMESTAMP</literal>
+        columns behave this way, the <literal>NULL</literal> and
+        <literal>NOT NULL</literal> attributes do not apply in the
+        normal way and are ignored if you specify them. On the other
+        hand, to make it easier for MySQL clients to use
+        <literal>TIMESTAMP</literal> columns, the server reports that
+        such columns can be assigned <literal>NULL</literal> values
+        (which is true), even though <literal>TIMESTAMP</literal> never
+        actually contains a <literal>NULL</literal> value. You can see
+        this when you use <literal>DESCRIBE
+        <replaceable>tbl_name</replaceable></literal> to get a
         description of your table.
       </para>
-      
+
       <para>
         Note that setting a <literal>TIMESTAMP</literal> column to
         <literal>0</literal> is not the same as setting it to
@@ -2716,7 +2715,7 @@
               </para>
 
 <programlisting>
-CREATE TABLE t1 (col1 INT, col2 CHAR(5)) 
+CREATE TABLE t1 (col1 INT, col2 CHAR(5))
     PARTITION BY HASH(col1);
 
 CREATE TABLE t1 (col1 INT, col2 CHAR(5))
@@ -2862,9 +2861,9 @@
 
 <programlisting>
 CREATE TABLE t1 (
-    year_col  INT, 
-    some_data INT 
-) 
+    year_col  INT,
+    some_data INT
+)
 PARTITION BY RANGE (year_col) (
     PARTITION p0 VALUES LESS THAN (1991),
     PARTITION p1 VALUES LESS THAN (1995),
@@ -3162,7 +3161,7 @@
                 or <literal>KEY</literal>, and can be done only on
                 <literal>RANGE</literal> or <literal>LIST</literal>
                 partitions. See
-                <xref 
+                <xref
                   linkend="partitioning-subpartitions"/>.
               </para>
             </listitem>
@@ -9689,26 +9688,26 @@
           parse error.
         </remark>
 
-<!--       
+<!--
        <para>
          For more complicated subqueries, you can often create temporary
-         tables to hold the subquery. In some cases, however, this 
-         option does not work. The most frequently encountered of these 
-         cases arises with <literal>DELETE</literal> statements, for 
-         which standard SQL does not support joins (except in 
-         subqueries). For this situation, there are three options 
+         tables to hold the subquery. In some cases, however, this
+         option does not work. The most frequently encountered of these
+         cases arises with <literal>DELETE</literal> statements, for
+         which standard SQL does not support joins (except in
+         subqueries). For this situation, there are three options
          available:
        </para>
-       
+
        <itemizedlist>
-         
+
          <listitem>
            <para>
              The first option is to upgrade to MySQL 4.1, which does support
              subqueries in <literal>DELETE</literal> statements.
            </para>
          </listitem>
-         
+
          <listitem><para>
              The second option is to use a procedural programming language
              (such as Perl or PHP) to submit a <literal>SELECT</literal> query
@@ -9717,32 +9716,32 @@
              statement (<literal>DELETE FROM ... WHERE key_col IN (key1, key2,
                ...)</literal>).
            </para></listitem>
-         
+
          <listitem><para>
              The third option is to use interactive SQL to construct a set of
              <literal>DELETE</literal> statements automatically, using the
              MySQL extension <literal>CONCAT()</literal> (in lieu of the
              standard <literal>||</literal> operator). For example:
            </para>
-           
+
            <programlisting>
              SELECT
              CONCAT('DELETE FROM tab1 WHERE pkid = ', "'", tab1.pkid, "'", ';')
              FROM tab1, tab2
              WHERE tab1.col1 = tab2.col2;
 </programlisting>
-           
+
            <para>
              You can place this query in a script file, use the file as input
              to one instance of the <command>mysql</command> program, and use
              the program output as input to a second instance of
              <command>mysql</command>:
            </para>
-           
+
            <programlisting>
              shell&gt; mysql - -skip-column-names mydb &lt; myscript.sql | mysql mydb
 </programlisting>
-         
+
        </itemizedlist>
 -->
 
@@ -12933,28 +12932,12 @@
               columns are set to their implicit default values if strict
               SQL mode is not enabled. In strict mode, the statement is
               rejected if any of the omitted columns have no default
-              value. <xref linkend="server-sql-mode"/>, discusses strict
-              mode. <xref linkend="create-table"/>, discusses implicit
+              value. (Standard SQL requires you to have the
+              <literal>INSERT</literal> privilege on all columns.)
+              <xref linkend="server-sql-mode"/>, discusses strict mode.
+              <xref linkend="data-type-defaults"/>, discusses implicit
               default values.
             </para>
-
-            <para>
-              The columns for which you don't have the
-              <literal>INSERT</literal> privilege are set to their
-              default values. Standard SQL requires you to have the
-              <literal>INSERT</literal> privilege on all columns.
-            </para>
-
-            <para>
-              In MySQL, if you have the INSERT privilege on only some of
-              the columns in a table, you can still execute INSERT
-              statements on the table &mdash; provided you omit the
-              columns on which you do not have the privilege from your
-              INSERT statement; those columns will be set to their
-              default values. Under strict mode (i.e. when
-              sql_mode='traditional', if any of the omitted columns have
-              no default value, the INSERT statement will be rejected.
-            </para>
           </listitem>
 
         </itemizedlist>
@@ -13054,7 +13037,7 @@
 
         <para>
           The second syntax sets the password for a specific account on
-          the current server host. Only clients with the
+          the current server host. Only clients that have the
           <literal>UPDATE</literal> privilege for the
           <literal>mysql</literal> database can do this. The
           <replaceable>user</replaceable> value should be given in
@@ -13071,7 +13054,7 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>SET PASSWORD FOR 'bob'@'%.loc.gov' = PASSWORD('<replaceable>newpass</replaceable>');</userinput>
+SET PASSWORD FOR 'bob'@'%.loc.gov' = PASSWORD('<replaceable>newpass</replaceable>');
 </programlisting>
 
         <remark role="help-description-end"/>
@@ -13081,9 +13064,9 @@
         </para>
 
 <programlisting>
-mysql&gt; <userinput>UPDATE mysql.user SET Password=PASSWORD('<replaceable>newpass</replaceable>')</userinput>
-    -&gt; <userinput>WHERE User='bob' AND Host='%.loc.gov';</userinput>
-mysql&gt; <userinput>FLUSH PRIVILEGES;</userinput>
+UPDATE mysql.user SET Password=PASSWORD('<replaceable>newpass</replaceable>')
+  WHERE User='bob' AND Host='%.loc.gov';
+FLUSH PRIVILEGES;
 </programlisting>
 
         <para>
@@ -13098,9 +13081,8 @@
         </para>
 
         <para>
-          You can see what your current authentication
-          <literal>user@host</literal> entry is by executing
-          <literal>SELECT CURRENT_USER()</literal>.
+          You can see which account the server authenticated you as by
+          executing <literal>SELECT CURRENT_USER()</literal>.
         </para>
 
       </section>
@@ -13134,12 +13116,13 @@
         <remark role="help-description-begin"/>
 
         <para>
-          This statement analyzes and stores the key distribution for a
-          table. During the analysis, the table is locked with a read
-          lock. This works with <literal>MyISAM</literal>,
-          <literal>BDB</literal>, and <literal>InnoDB</literal> tables.
-          For <literal>MyISAM</literal> tables, this statement is
-          equivalent to using <command>myisamchk -a</command>.
+          <literal>ANALYZE TABLE</literal> analyzes and stores the key
+          distribution for a table. During the analysis, the table is
+          locked with a read lock. This statement works with
+          <literal>MyISAM</literal>, <literal>BDB</literal>, and
+          <literal>InnoDB</literal> tables. For
+          <literal>MyISAM</literal> tables, this statement is equivalent
+          to using <command>myisamchk -a</command>.
         </para>
 
         <para>
@@ -13151,7 +13134,8 @@
         <remark role="help-description-end"/>
 
         <para>
-          The statement returns a table with the following columns:
+          <literal>ANALYZE TABLE</literal> returns a result set with the
+          following columns:
         </para>
 
         <informaltable>
@@ -13250,27 +13234,24 @@
           <filename>.MYD</filename> data files. The
           <filename>.MYI</filename> index file can be rebuilt from those
           two files. The directory should be specified as a full
-          pathname.
+          pathname. To restore the table, use <literal>RESTORE
+          TABLE</literal>.
         </para>
 
         <remark role="help-description-end"/>
 
         <para>
-          Before using this statement, please see
-          <xref linkend="backup"/>.
-        </para>
-
-        <para>
           During the backup, a read lock is held for each table, one at
           time, as they are being backed up. If you want to back up
           several tables as a snapshot (preventing any of them from
-          being changed during the backup operation), you must first
-          issue a <literal>LOCK TABLES</literal> statement to obtain a
-          read lock for every table in the group.
+          being changed during the backup operation), issue a
+          <literal>LOCK TABLES</literal> statement first, to obtain a
+          read lock for all tables in the group.
         </para>
 
         <para>
-          The statement returns a table with the following columns:
+          <literal>BACKUP TABLE</literal> returns a result set with the
+          following columns:
         </para>
 
         <informaltable>
@@ -13330,11 +13311,11 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Checks a table or tables for errors. <literal>CHECK
-          TABLE</literal> works for <literal>MyISAM</literal> and
-          <literal>InnoDB</literal> tables. For
-          <literal>MyISAM</literal> tables, the key statistics are
-          updated.
+          <literal>CHECK TABLE</literal> checks a table or tables for
+          errors. <literal>CHECK TABLE</literal> works for
+          <literal>MyISAM</literal> and <literal>InnoDB</literal>
+          tables. For <literal>MyISAM</literal> tables, the key
+          statistics are updated as well.
         </para>
 
         <para>
@@ -13346,8 +13327,8 @@
         <remark role="help-description-end"/>
 
         <para>
-          The <literal>CHECK TABLE</literal> statement returns a table
-          with the following columns:
+          <literal>CHECK TABLE</literal> returns a result set with the
+          following columns:
         </para>
 
         <informaltable>
@@ -13455,9 +13436,9 @@
         </para>
 
         <para>
-          You can combine check options, as in the following example,
-          which does a quick check on the table to see whether it was
-          closed properly:
+          You can combine check options, as in the following example
+          that does a quick check on the table to determine whether it
+          was closed properly:
         </para>
 
 <programlisting>
@@ -13506,8 +13487,8 @@
         <para>
           <literal>EXTENDED</literal> is to be used only after you have
           run a normal check but still get strange errors from a table
-          when MySQL tries to update a row or find a row by key. (This
-          is very unlikely if a normal check has succeeded.)
+          when MySQL tries to update a row or find a row by key. This is
+          very unlikely if a normal check has succeeded.
         </para>
 
         <para>
@@ -13572,36 +13553,35 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Reports a table checksum.
+          <literal>CHECKSUM TABLE</literal> reports a table checksum.
         </para>
 
         <para>
-          If <literal>QUICK</literal> is specified, the live table
-          checksum is reported if it is available, or
-          <literal>NULL</literal> otherwise. This is very fast. A live
-          checksum is enabled by specifying the
-          <literal>CHECKSUM=1</literal> table option, currently
-          supported only for <literal>MyISAM</literal> tables. See
+          With <literal>QUICK</literal>, the live table checksum is
+          reported if it is available, or <literal>NULL</literal>
+          otherwise. This is very fast. A live checksum is enabled by
+          specifying the <literal>CHECKSUM=1</literal> table option when
+          you create the table; currently, this is supported only for
+          <literal>MyISAM</literal> tables. See
           <xref linkend="create-table"/>.
         </para>
 
         <para>
-          In <literal>EXTENDED</literal> mode the whole table is read
-          row by row and the checksum is calculated. This can be very
-          slow for large tables.
+          With <literal>EXTENDED</literal>, the entire table is read row
+          by row and the checksum is calculated. This can be very slow
+          for large tables.
         </para>
 
         <para>
-          By default, if neither <literal>QUICK</literal> nor
+          If neither <literal>QUICK</literal> nor
           <literal>EXTENDED</literal> is specified, MySQL returns a live
           checksum if the table storage engine supports it and scans the
           table otherwise.
         </para>
 
         <para>
-          <literal>CHECKSUM TABLE</literal> returns
-          <literal>NULL</literal> for non-existent tables. A warning is
-          generated for this condition.
+          For a non-existent table, <literal>CHECKSUM TABLE</literal>
+          returns <literal>NULL</literal> and generates a warning.
         </para>
 
         <remark role="help-description-end"/>
@@ -13648,12 +13628,12 @@
           <literal>OPTIMIZE TABLE</literal> should be used if you have
           deleted a large part of a table or if you have made many
           changes to a table with variable-length rows (tables that have
-          <literal>VARCHAR</literal>, <literal>BLOB</literal>, or
-          <literal>TEXT</literal> columns). Deleted rows are maintained
-          in a linked list and subsequent <literal>INSERT</literal>
-          operations reuse old row positions. You can use
-          <literal>OPTIMIZE TABLE</literal> to reclaim the unused space
-          and to defragment the data file.
+          <literal>VARCHAR</literal>, <literal>VARBINARY</literal>,
+          <literal>BLOB</literal>, or <literal>TEXT</literal> columns).
+          Deleted rows are maintained in a linked list and subsequent
+          <literal>INSERT</literal> operations reuse old row positions.
+          You can use <literal>OPTIMIZE TABLE</literal> to reclaim the
+          unused space and to defragment the data file.
         </para>
 
         <remark role="help-description-end"/>
@@ -13667,7 +13647,7 @@
         </para>
 
         <para>
-          <literal>OPTIMIZE TABLE</literal> works only on
+          <literal>OPTIMIZE TABLE</literal> works only for
           <literal>MyISAM</literal>, <literal>BDB</literal>, and
           <literal>InnoDB</literal> tables.
         </para>
@@ -13704,22 +13684,60 @@
         <para>
           For <literal>BDB</literal> tables, <literal>OPTIMIZE
           TABLE</literal> currently is mapped to <literal>ANALYZE
-          TABLE</literal>. For <literal>InnoDB</literal> tables, it is
-          mapped to <literal>ALTER TABLE</literal>, which rebuilds the
-          table. Rebuilding updates index statistics and frees unused
-          space in the clustered index. See
-          <xref linkend="analyze-table"/>.
+          TABLE</literal>. See <xref linkend="analyze-table"/>.
         </para>
 
         <para>
+          For <literal>InnoDB</literal> tables, <literal>OPTIMIZE
+          TABLE</literal> is mapped to <literal>ALTER TABLE</literal>,
+          which rebuilds the table to update index statistics and free
+          unused space in the clustered index.
+        </para>
+
+        <para>
           You can make <literal>OPTIMIZE TABLE</literal> work on other
           storage engines by starting <command>mysqld</command> with the
           <option>--skip-new</option> or <option>--safe-mode</option>
-          option; in this case, <literal>OPTIMIZE TABLE</literal> is
+          option. In this case, <literal>OPTIMIZE TABLE</literal> is
           just mapped to <literal>ALTER TABLE</literal>.
         </para>
 
         <para>
+          <literal>OPTIMIZE TABLE</literal> returns a result set with
+          the following columns:
+        </para>
+
+        <informaltable>
+          <tgroup cols="2">
+            <colspec colwidth="15*"/>
+            <colspec colwidth="60*"/>
+            <tbody>
+              <row>
+                <entry><emphasis role="bold">Column</emphasis></entry>
+                <entry><emphasis role="bold">Value</emphasis></entry>
+              </row>
+              <row>
+                <entry><literal>Table</literal></entry>
+                <entry>The table name</entry>
+              </row>
+              <row>
+                <entry><literal>Op</literal></entry>
+                <entry>Always <literal>optimize</literal></entry>
+              </row>
+              <row>
+                <entry><literal>Msg_type</literal></entry>
+                <entry>One of <literal>status</literal>, <literal>error</literal>,
+                  <literal>info</literal>, or <literal>warning</literal></entry>
+              </row>
+              <row>
+                <entry><literal>Msg_text</literal></entry>
+                <entry>The message</entry>
+              </row>
+            </tbody>
+          </tgroup>
+        </informaltable>
+
+        <para>
           Note that MySQL locks the table during the time
           <literal>OPTIMIZE TABLE</literal> is running.
         </para>
@@ -13764,18 +13782,18 @@
           table. By default, it has the same effect as
           <command>myisamchk --recover
           <replaceable>tbl_name</replaceable></command>. <literal>REPAIR
-          TABLE</literal> works on <literal>MyISAM</literal> and on
+          TABLE</literal> works for <literal>MyISAM</literal> and for
           <literal>ARCHIVE</literal> tables. See
-          <xref linkend="myisam-storage-engine"/>,
+          <xref linkend="myisam-storage-engine"/>, and
           <xref linkend="archive-storage-engine"/>.
         </para>
 
         <remark role="help-description-end"/>
 
         <para>
-          Normally you should never have to run this statement. However,
-          if disaster strikes, <literal>REPAIR TABLE</literal> is very
-          likely to get back all your data from a
+          Normally, you should never have to run this statement.
+          However, if disaster strikes, <literal>REPAIR TABLE</literal>
+          is very likely to get back all your data from a
           <literal>MyISAM</literal> table. If your tables become
           corrupted often, you should try to find the reason for it, to
           eliminate the need to use <literal>REPAIR TABLE</literal>. See
@@ -13784,9 +13802,23 @@
         </para>
 
         <para>
-          This statement returns a table with the following columns:
+          <emphasis role="bold">Warning:</emphasis> If the server dies
+          during a <literal>REPAIR TABLE</literal> operation, it is
+          essential after restarting it that you immediately execute
+          another <literal>REPAIR TABLE</literal> statement for the
+          table before performing any other operations on it. (It is
+          always a good idea to start by making a backup.) In the worst
+          case, you might have a new clean index file without
+          information about the data file, and then the next operation
+          you perform could overwrite the data file. This is an unlikely
+          but possible scenario.
         </para>
 
+        <para>
+          <literal>REPAIR TABLE</literal> returns a result set with the
+          following columns:
+        </para>
+
         <informaltable>
           <tgroup cols="2">
             <colspec colwidth="15*"/>
@@ -13824,10 +13856,10 @@
           <literal>status</literal> and <literal>Msg_test</literal>
           normally should be <literal>OK</literal>. If you do not get
           <literal>OK</literal>, you should try repairing the table with
-          <command>myisamchk --safe-recover</command>, because
-          <literal>REPAIR TABLE</literal> does not yet implement all the
-          options of <command>myisamchk</command>. We plan to make it
-          more flexible in the future.
+          <command>myisamchk --safe-recover</command>. (<literal>REPAIR
+          TABLE</literal> does not yet implement all the options of
+          <command>myisamchk</command>. We plan to make it more flexible
+          in the future.)
         </para>
 
         <para>
@@ -13853,14 +13885,14 @@
           <filename>.frm</filename> file. This kind of repair cannot be
           done with <command>myisamchk</command>.
           <emphasis role="bold">Note</emphasis>: Use this mode
-          <emphasis role="bold">only</emphasis> if you cannot use
-          regular <literal>REPAIR</literal> modes.
-          <filename>.MYI</filename> header contains important table
-          metadata (in particular, current
-          <literal>AUTO_INCREMENT</literal> value and <literal>Delete
-          link</literal>) that are lost in <literal>REPAIR ...
-          USE_FRM</literal>. Don't use <literal>USE_FRM</literal> if the
-          table is compressed, as this information is also stored in the
+          <emphasis>only</emphasis> if you cannot use regular
+          <literal>REPAIR</literal> modes. <filename>.MYI</filename>
+          header contains important table metadata (in particular,
+          current <literal>AUTO_INCREMENT</literal> value and
+          <literal>Delete link</literal>) that are lost in
+          <literal>REPAIR ... USE_FRM</literal>. Don't use
+          <literal>USE_FRM</literal> if the table is compressed because
+          this information is also stored in the
           <filename>.MYI</filename> file.
         </para>
 
@@ -13874,19 +13906,6 @@
           default to the replication slave.
         </para>
 
-        <para>
-          <emphasis role="bold">Warning:</emphasis> If the server dies
-          during a <literal>REPAIR TABLE</literal> operation, it is
-          essential after restarting it that you immediately execute
-          another <literal>REPAIR TABLE</literal> statement for the
-          table before performing any other operations on it. (It is
-          always a good idea to start by making a backup.) In the worst
-          case, you might have a new clean index file without
-          information about the data file, and then the next operation
-          you perform could overwrite the data file. This is an unlikely
-          but possible scenario.
-        </para>
-
       </section>
 
       <section id="restore-table">
@@ -13908,11 +13927,12 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Restores the table or tables from a backup that was made with
-          <literal>BACKUP TABLE</literal>. Existing tables are not
-          overwritten; if you try to restore over an existing table, you
-          get an error. Just as <literal>BACKUP TABLE</literal>,
-          <literal>RESTORE TABLE</literal> currently works only for
+          <literal>RESTORE TABLE</literal> restores the table or tables
+          from a backup that was made with <literal>BACKUP
+          TABLE</literal>. Existing tables are not overwritten; if you
+          try to restore over an existing table, an error occurs. Just
+          as for <literal>BACKUP TABLE</literal>, <literal>RESTORE
+          TABLE</literal> currently works only for
           <literal>MyISAM</literal> tables. The directory should be
           specified as a full pathname.
         </para>
@@ -13930,7 +13950,8 @@
         <remark role="help-description-end"/>
 
         <para>
-          The statement returns a table with the following columns:
+          <literal>RESTORE TABLE</literal> returns a result set with the
+          following columns:
         </para>
 
         <informaltable>
@@ -14383,18 +14404,18 @@
 <!--
         <listitem>
           <remark>NOT YET IMPLEMENTED:</remark>
-          
+
           <para>
-            <literal>DATE_FORMAT = 
+            <literal>DATE_FORMAT =
               <replaceable>format_str</replaceable></literal>
           </para>
-          
+
           <para>
-            Determines how the server converts <literal>DATE</literal> 
-            values to strings. This variable is available as a global, 
-            local, or command-line option. 
-            <replaceable>format_str</replaceable> can be specified 
-            conveniently using the <literal>GET_FORMAT()</literal> 
+            Determines how the server converts <literal>DATE</literal>
+            values to strings. This variable is available as a global,
+            local, or command-line option.
+            <replaceable>format_str</replaceable> can be specified
+            conveniently using the <literal>GET_FORMAT()</literal>
             function. See <xref linkend="date-and-time-functions"/>.
           </para>
         </listitem>
@@ -14403,18 +14424,18 @@
 <!--
         <listitem>
           <remark>NOT YET IMPLEMENTED:</remark>
-          
+
           <para>
-            <literal>DATETIME_FORMAT = 
+            <literal>DATETIME_FORMAT =
               <replaceable>format_str</replaceable></literal>
           </para>
-          
+
           <para>
-            Determines how the server converts 
-            <literal>DATETIME</literal> values to strings. This variable 
-            is available as a global, local, or command-line option. 
-            <replaceable>format_str</replaceable> can be specified 
-            conveniently using the <literal>GET_FORMAT()</literal> 
+            Determines how the server converts
+            <literal>DATETIME</literal> values to strings. This variable
+            is available as a global, local, or command-line option.
+            <replaceable>format_str</replaceable> can be specified
+            conveniently using the <literal>GET_FORMAT()</literal>
             function. See <xref linkend="date-and-time-functions"/>.
           </para>
         </listitem>
@@ -14541,7 +14562,7 @@
 <programlisting>
 mysql> <userinput>SET ONE_SHOT max_allowed_packet = 1;</userinput>
 ERROR 1382 (HY000): The 'SET ONE_SHOT' syntax is reserved for purposes
-internal to the MySQL server 
+internal to the MySQL server
 </programlisting>
 
           <para>
@@ -14786,18 +14807,18 @@
 <!--
         <listitem>
           <remark>NOT YET IMPLEMENTED:</remark>
-          
+
           <para>
-            <literal>TIME_FORMAT = 
+            <literal>TIME_FORMAT =
               <replaceable>format_str</replaceable></literal>
           </para>
-          
+
           <para>
-            Determines how the server converts <literal>TIME</literal> 
-            values to strings. This variable is available as a global, 
-            local, or command-line option. 
-            <replaceable>format_str</replaceable> can be specified 
-            conveniently using the <literal>GET_FORMAT()</literal> 
+            Determines how the server converts <literal>TIME</literal>
+            values to strings. This variable is available as a global,
+            local, or command-line option.
+            <replaceable>format_str</replaceable> can be specified
+            conveniently using the <literal>GET_FORMAT()</literal>
             function. See <xref linkend="date-and-time-functions"/>.
           </para>
         </listitem>
@@ -15092,7 +15113,7 @@
 
         <para>
           The <literal>Maxlen</literal> column shows the maximum number
-          of bytes used to store one character.
+          of bytes required to store one character.
         </para>
 
       </section>
@@ -15256,9 +15277,10 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Shows a <literal>CREATE DATABASE</literal> statement that
+          Shows the <literal>CREATE DATABASE</literal> statement that
           creates the given database. <literal>SHOW CREATE
-          SCHEMA</literal> can also be used.
+          SCHEMA</literal> is a synonym for <literal>SHOW CREATE
+          DATABASE</literal>.
         </para>
 
         <remark role="help-description-end"/>
@@ -15275,12 +15297,19 @@
 mysql&gt; <userinput>SHOW CREATE SCHEMA test\G</userinput>
 *************************** 1. row ***************************
        Database: test
-Create Database: CREATE DATABASE `test` 
+Create Database: CREATE DATABASE `test`
                  /*!40100 DEFAULT CHARACTER SET latin1 */
 </programlisting>
 
         <remark role="help-example-end"/>
 
+        <para>
+          <literal>SHOW CREATE DATABASE</literal> quotes table and
+          column names according to the value of the
+          <literal>SQL_QUOTE_SHOW_CREATE</literal> option. See
+          <xref linkend="set-option"/>.
+        </para>
+
       </section>
 
       <section id="show-create-table">
@@ -15306,8 +15335,8 @@
         <remark role="help-description-begin"/>
 
         <para>
-          Shows a <literal>CREATE TABLE</literal> statement that creates
-          the given table. This statement also works with views.
+          Shows the <literal>CREATE TABLE</literal> statement that
+          creates the given table. This statement also works with views.
         </para>
 
         <remark role="help-description-end"/>
@@ -15369,11 +15398,10 @@
 
         <para>
           <literal>SHOW DATABASES</literal> lists the databases on the
-          MySQL server host. You can also get this list using the
-          <command>mysqlshow</command> command. You see only those
-          databases for which you have some kind of privilege, unless
-          you have the global <literal>SHOW DATABASES</literal>
-          privilege.
+          MySQL server host. You see only those databases for which you
+          have some kind of privilege, unless you have the global
+          <literal>SHOW DATABASES</literal> privilege. You can also get
+          this list using the <command>mysqlshow</command> command.
         </para>
 
         <para>
@@ -16972,13 +17000,13 @@
 | Created_tmp_disk_tables  | 0          |
 | Created_tmp_tables       | 8340       |
 | Created_tmp_files        | 60         |
-...                       ...          ...
+...
 | Open_tables              | 1          |
 | Open_files               | 2          |
 | Open_streams             | 0          |
 | Opened_tables            | 44600      |
 | Questions                | 2026873    |
-...                       ...          ...
+...
 | Table_locks_immediate    | 1920382    |
 | Table_locks_waited       | 0          |
 | Threads_cached           | 0          |
@@ -17413,7 +17441,7 @@
 Statement: SET @sum = @sum + NEW.amount
    Timing: BEFORE
   Created: NULL
- sql_mode: 
+ sql_mode:
   Definer: myname@localhost
 </programlisting>
 
@@ -17617,7 +17645,7 @@
 | bulk_insert_buffer_size         | 8388608                   |
 | character_set_client            | latin1                    |
 | character_set_connection        | latin1                    |
-...                               ...                                              
+...
 | max_user_connections            | 0                         |
 | max_write_lock_count            | 4294967295                |
 | multi_range_count               | 256                       |
@@ -17629,7 +17657,7 @@
 | ndb_autoincrement_prefetch_sz   | 32                        |
 | ndb_cache_check_time            | 0                         |
 | ndb_force_send                  | ON                        |
-...                               ...                                                       ...    
+...
 | time_zone                       | SYSTEM                    |
 | timed_mutexes                   | OFF                       |
 | tmp_table_size                  | 33554432                  |
@@ -19264,7 +19292,7 @@
 
           <listitem>
             <para>
-              It works only with <literal>MyISAM</literal> tables.
+              It works only for <literal>MyISAM</literal> tables.
               Attempting to load a non-<literal>MyISAM</literal> table
               results in the following error:
             </para>

Thread
svn commit - mysqldoc@docsrva: r1079 - in trunk: . refman-4.1 refman-5.0 refman-5.1paul28 Jan