List:Commits« Previous MessageNext Message »
From:paul Date:January 26 2006 6:26pm
Subject:svn commit - mysqldoc@docsrva: r1047 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-26 19:26:10 +0100 (Thu, 26 Jan 2006)
New Revision: 1047

Log:
 r2556@kite-hub:  paul | 2006-01-26 12:25:58 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/apis.xml
   trunk/refman-4.1/charset.xml
   trunk/refman-4.1/client-utility-programs.xml
   trunk/refman-4.1/connector-odbc.xml
   trunk/refman-4.1/replication.xml
   trunk/refman-4.1/spatial-extensions.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/apis.xml
   trunk/refman-5.0/charset.xml
   trunk/refman-5.0/client-utility-programs.xml
   trunk/refman-5.0/connector-odbc.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.0/innodb.xml
   trunk/refman-5.0/replication.xml
   trunk/refman-5.0/spatial-extensions.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/apis.xml
   trunk/refman-5.1/charset.xml
   trunk/refman-5.1/client-utility-programs.xml
   trunk/refman-5.1/connector-odbc.xml
   trunk/refman-5.1/data-types.xml
   trunk/refman-5.1/innodb.xml
   trunk/refman-5.1/replication.xml
   trunk/refman-5.1/spatial-extensions.xml
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-4.1/apis.xml
===================================================================
--- trunk/refman-4.1/apis.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-4.1/apis.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -8933,12 +8933,12 @@
       <para>
         Each <literal>Prepare</literal> and <literal>Execute</literal>
         line in the log is tagged with a
-        <literal>[<replaceable>n</replaceable>]</literal> statement
+        <literal>[<replaceable>N</replaceable>]</literal> statement
         identifier so that you can keep track of which prepared
-        statement is being logged. <replaceable>n</replaceable> is a
+        statement is being logged. <replaceable>N</replaceable> is a
         positive integer. If there are multiple prepared statements
         active simultaneously for the client,
-        <replaceable>n</replaceable> may be greater than 1. Each
+        <replaceable>N</replaceable> may be greater than 1. Each
         <literal>Execute</literal> lines shows a prepared statement
         after substitution of data values for <literal>?</literal>
         parameters.
@@ -8946,7 +8946,7 @@
 
       <para>
         Version notes: <literal>Prepare</literal> lines are displayed
-        without <literal>[<replaceable>n</replaceable>]</literal> before
+        without <literal>[<replaceable>N</replaceable>]</literal> before
         MySQL 4.1.10. <literal>Execute</literal> lines are not displayed
         at all before MySQL 4.1.10.
       </para>

Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-4.1/charset.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -1063,8 +1063,8 @@
       </para>
 
 <programlisting>
-CREATE TABLE t1 (f1 CHAR(<replaceable>n</replaceable>) UNICODE);
-CREATE TABLE t1 (f1 CHAR(<replaceable>n</replaceable>) CHARACTER SET ucs2);
+CREATE TABLE t1 (f1 CHAR(<replaceable>N</replaceable>) UNICODE);
+CREATE TABLE t1 (f1 CHAR(<replaceable>N</replaceable>) CHARACTER SET ucs2);
 </programlisting>
 
     </section>

Modified: trunk/refman-4.1/client-utility-programs.xml
===================================================================
--- trunk/refman-4.1/client-utility-programs.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-4.1/client-utility-programs.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -1270,7 +1270,7 @@
               <option>-n</option>, but creates all the keys in parallel,
               using different threads. This option was added in MySQL
               4.0.2. <emphasis>This is beta-quality code; use at your
-              own risk</emphasis>.
+              own risk!</emphasis>.
             </para>
           </listitem>
 

Modified: trunk/refman-4.1/connector-odbc.xml
===================================================================
--- trunk/refman-4.1/connector-odbc.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-4.1/connector-odbc.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -3602,8 +3602,8 @@
                 to be able to update. For maximum portability, don't use
                 a length specification in the column declaration. That
                 is, use <literal>TIMESTAMP</literal>, not
-                <literal>TIMESTAMP(<replaceable>n</replaceable>)</literal>,
-                <replaceable>n</replaceable> &lt; 14.
+                <literal>TIMESTAMP(<replaceable>N</replaceable>)</literal>,
+                <replaceable>N</replaceable> &lt; 14.
               </para>
             </listitem>
 
@@ -4689,8 +4689,8 @@
             be able to update. For maximum portability, don't use a
             length specification in the column declaration. That is, use
             <literal>TIMESTAMP</literal>, not
-            <literal>TIMESTAMP(<replaceable>n</replaceable>)</literal>,
-            <replaceable>n</replaceable> &lt; 14.
+            <literal>TIMESTAMP(<replaceable>N</replaceable>)</literal>,
+            <replaceable>N</replaceable> &lt; 14.
           </para>
         </listitem>
 

Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-4.1/replication.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -4264,12 +4264,12 @@
             </para>
 
 <programlisting>
-mysql&gt; <userinput>SET GLOBAL SQL_SLAVE_SKIP_COUNTER = <replaceable>n</replaceable>;</userinput>
+mysql&gt; <userinput>SET GLOBAL SQL_SLAVE_SKIP_COUNTER = <replaceable>N</replaceable>;</userinput>
 mysql&gt; <userinput>START SLAVE;</userinput>
 </programlisting>
 
             <para>
-              The value of <replaceable>n</replaceable> should be 1 if
+              The value of <replaceable>N</replaceable> should be 1 if
               the next statement from the master does not use
               <literal>AUTO_INCREMENT</literal> or
               <literal>LAST_INSERT_ID()</literal>. Otherwise, the value

Modified: trunk/refman-4.1/spatial-extensions.xml
===================================================================
--- trunk/refman-4.1/spatial-extensions.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-4.1/spatial-extensions.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -3547,11 +3547,11 @@
                 <primary>PointN()</primary>
               </indexterm>
 
-              <literal>PointN(<replaceable>ls</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>PointN(<replaceable>ls</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
 
             <para>
-              Returns the <replaceable>n</replaceable>-th
+              Returns the <replaceable>N</replaceable>-th
               <literal>Point</literal> in the
               <literal>Linestring</literal> value
               <replaceable>ls</replaceable>. Points are numbered
@@ -3818,11 +3818,11 @@
                 <primary>InteriorRingN()</primary>
               </indexterm>
 
-              <literal>InteriorRingN(<replaceable>poly</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>InteriorRingN(<replaceable>poly</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
 
             <para>
-              Returns the <replaceable>n</replaceable>-th interior ring
+              Returns the <replaceable>N</replaceable>-th interior ring
               for the <literal>Polygon</literal> value
               <replaceable>poly</replaceable> as a
               <literal>LineString</literal>. Rings are numbered
@@ -3991,11 +3991,11 @@
                 <primary>GeometryN()</primary>
               </indexterm>
 
-              <literal>GeometryN(<replaceable>gc</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>GeometryN(<replaceable>gc</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
 
             <para>
-              Returns the <replaceable>n</replaceable>-th geometry in
+              Returns the <replaceable>N</replaceable>-th geometry in
               the <literal>GeometryCollection</literal> value
               <replaceable>gc</replaceable>. Geometries are numbered
               beginning with 1.
@@ -4096,7 +4096,7 @@
 
           <listitem>
             <para>
-              <literal>PointN(<replaceable>ls</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>PointN(<replaceable>ls</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
           </listitem>
 
@@ -4108,13 +4108,13 @@
 
           <listitem>
             <para>
-              <literal>InteriorRingN(<replaceable>poly</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>InteriorRingN(<replaceable>poly</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>GeometryN(<replaceable>gc</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>GeometryN(<replaceable>gc</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
           </listitem>
 

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -1514,6 +1514,14 @@
 
         <listitem>
           <para>
+            From MySQL 4.1.0 on, the attribute <literal>SERIAL</literal>
+            can be used as an alias for <literal>BIGINT UNSIGNED NOT
+            NULL AUTO_INCREMENT UNIQUE</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             As of MySQL 4.1, character data types
             (<literal>CHAR</literal>, <literal>VARCHAR</literal>,
             <literal>TEXT</literal>) can include <literal>CHARACTER
@@ -1617,14 +1625,6 @@
 
         <listitem>
           <para>
-            From MySQL 4.1.0 on, the attribute <literal>SERIAL</literal>
-            can be used as an alias for <literal>BIGINT UNSIGNED NOT
-            NULL AUTO_INCREMENT UNIQUE</literal>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
             <literal>KEY</literal> is normally a synonym for
             <literal>INDEX</literal>. From MySQL 4.1, the key attribute
             <literal>PRIMARY KEY</literal> can also be specified as just
@@ -1636,14 +1636,15 @@
 
         <listitem>
           <para>
-            In MySQL, a <literal>UNIQUE</literal> index is one in which
-            all values in the index must be distinct. An error occurs if
-            you try to add a new row with a key that matches an existing
-            row. The exception to this is that if a column in the index
-            is allowed to contain <literal>NULL</literal> values, it can
-            contain multiple <literal>NULL</literal> values. This
-            exception does not apply to <literal>BDB</literal> tables,
-            for which an indexed column allows only a single
+            A <literal>UNIQUE</literal> index creates a constraint such
+            that all values in the index must be distinct. An error
+            occurs if you try to add a new row with a key that matches
+            an existing row. The exception to this is that if a column
+            in the index is allowed to contain <literal>NULL</literal>
+            values, it can contain multiple <literal>NULL</literal>
+            values. This exception does not apply to
+            <literal>BDB</literal> tables, for which a column with a
+            <literal>UNIQUE</literal> index allows only a single
             <literal>NULL</literal>.
           </para>
         </listitem>
@@ -1654,16 +1655,16 @@
               <primary>PRIMARY KEY</primary>
             </indexterm>
 
-            A <literal>PRIMARY KEY</literal> is a unique
-            <literal>KEY</literal> where all key columns must be defined
-            as <literal>NOT NULL</literal>. If they are not explicitly
-            declared as <literal>NOT NULL</literal>, MySQL declares them
-            so implicitly (and silently). A table can have only one
-            <literal>PRIMARY KEY</literal>. If you do not have a
-            <literal>PRIMARY KEY</literal> and an application asks for
-            the <literal>PRIMARY KEY</literal> in your tables, MySQL
-            returns the first <literal>UNIQUE</literal> index that has
-            no <literal>NULL</literal> columns as the <literal>PRIMARY
+            A <literal>PRIMARY KEY</literal> is a unique index where all
+            key columns must be defined as <literal>NOT NULL</literal>.
+            If they are not explicitly declared as <literal>NOT
+            NULL</literal>, MySQL declares them so implicitly (and
+            silently). A table can have only one <literal>PRIMARY
+            KEY</literal>. If you do not have a <literal>PRIMARY
+            KEY</literal> and an application asks for the
+            <literal>PRIMARY KEY</literal> in your tables, MySQL returns
+            the first <literal>UNIQUE</literal> index that has no
+            <literal>NULL</literal> columns as the <literal>PRIMARY
             KEY</literal>.
           </para>
         </listitem>
@@ -1692,6 +1693,10 @@
 
         <listitem>
           <para>
+            <indexterm>
+              <primary><literal>_rowid</literal></primary>
+            </indexterm>
+
             If a <literal>PRIMARY KEY</literal> or
             <literal>UNIQUE</literal> index consists of only one column
             that has an integer type, you can also refer to the column
@@ -1719,7 +1724,8 @@
             From MySQL 4.1.0 on, some storage engines allow you to
             specify an index type when creating an index. The syntax for
             the <replaceable>index_type</replaceable> specifier is
-            <literal>USING type_name</literal>.
+            <literal>USING
+            <replaceable>type_name</replaceable></literal>.
           </para>
 
           <para>
@@ -1803,12 +1809,12 @@
 
           <para>
             The <literal>MyISAM</literal> and (as of MySQL 4.0.14)
-            <literal>InnoDB</literal> storage engines also support
-            indexing on <literal>BLOB</literal> and
-            <literal>TEXT</literal> columns. When indexing a
-            <literal>BLOB</literal> or <literal>TEXT</literal> column,
-            you <emphasis>must</emphasis> specify a prefix length for
-            the index. For example:
+            <literal>InnoDB</literal> storage engines support indexing
+            on <literal>BLOB</literal> and <literal>TEXT</literal>
+            columns. When indexing a <literal>BLOB</literal> or
+            <literal>TEXT</literal> column, you
+            <emphasis>must</emphasis> specify a prefix length for the
+            index. For example:
           </para>
 
 <programlisting>
@@ -1821,7 +1827,9 @@
             limit is 255 bytes for all tables.) Note that prefix limits
             are measured in bytes, whereas the prefix length in
             <literal>CREATE TABLE</literal> statements is interpreted as
-            number of characters. Be sure to take this into account when
+            number of characters for non-binary data types
+            (<literal>CHAR</literal>, <literal>VARCHAR</literal>,
+            <literal>TEXT</literal>). Take this into account when
             specifying a prefix length for a column that uses a
             multi-byte character set.
           </para>
@@ -1893,12 +1901,11 @@
           </para>
 
           <para>
-            For other storage engines, MySQL Server parses the
-            <literal>FOREIGN KEY</literal> and
+            For other storage engines, MySQL Server parses and ignores
+            the <literal>FOREIGN KEY</literal> and
             <literal>REFERENCES</literal> syntax in <literal>CREATE
-            TABLE</literal> statements, but without further action being
-            taken. The <literal>CHECK</literal> clause is parsed but
-            ignored by all storage engines. See
+            TABLE</literal> statements. The <literal>CHECK</literal>
+            clause is parsed but ignored by all storage engines. See
             <xref linkend="ansi-diff-foreign-keys"/>.
           </para>
         </listitem>
@@ -2032,11 +2039,12 @@
 
       <para>
         If a storage engine is specified that is not available, MySQL
-        uses <literal>MyISAM</literal> instead. For example, if a table
-        definition includes the <literal>ENGINE=BDB</literal> option but
-        the MySQL server does not support <literal>BDB</literal> tables,
-        the table is created as a <literal>MyISAM</literal> table. This
-        makes it possible to have a replication setup where you have
+        uses the default engine instead. Normally, this is
+        <literal>MyISAM</literal>. For example, if a table definition
+        includes the <literal>ENGINE=BDB</literal> option but the MySQL
+        server does not support <literal>BDB</literal> tables, the table
+        is created as a <literal>MyISAM</literal> table. This makes it
+        possible to have a replication setup where you have
         transactional tables on the master but tables created on the
         slave are non-transactional (to get more speed). In MySQL 4.1.1,
         a warning occurs if the storage engine specification is not
@@ -2046,7 +2054,7 @@
       <para>
         The other table options are used to optimize the behavior of the
         table. In most cases, you do not have to specify any of them.
-        These options work for all storage engines unless otherwise
+        These options apply to all storage engines unless otherwise
         indicated:
       </para>
 
@@ -2074,7 +2082,7 @@
             <literal>AUTO_INCREMENT</literal> table option in
             <literal>CREATE TABLE</literal> statements, you can also use
             <literal>ALTER TABLE <replaceable>tbl_name</replaceable>
-            AUTO_INCREMENT = <replaceable>n</replaceable></literal> to
+            AUTO_INCREMENT = <replaceable>N</replaceable></literal> to
             reset the <literal>AUTO_INCREMENT</literal> value.
           </para>
         </listitem>
@@ -2118,12 +2126,9 @@
 
           <para>
             Specify a default character set for the table.
-            <literal>CHARSET</literal> is a synonym for this.
+            <literal>CHARSET</literal> is a synonym for
+            <literal>CHARACTER SET</literal>.
           </para>
-
-          <para>
-            for <literal>CHARACTER SET</literal>.
-          </para>
         </listitem>
 
         <listitem>
@@ -2147,8 +2152,8 @@
             automatically as the table changes). This makes the table a
             little slower to update, but also makes it easier to find
             corrupted tables. The <literal>CHECKSUM TABLE</literal>
-            statement reports the checksum (<literal>MyISAM</literal>
-            only).
+            statement reports the checksum. (<literal>MyISAM</literal>
+            only.)
           </para>
         </listitem>
 
@@ -2253,8 +2258,7 @@
 
           <para>
             Encrypt the <filename>.frm</filename> file with a password.
-            This option does not do anything in the standard MySQL
-            version.
+            This option does nothing in the standard MySQL version.
           </para>
         </listitem>
 
@@ -2265,8 +2269,10 @@
 
           <para>
             Set this to <literal>1</literal> if you want to delay key
-            updates for the table until the table is closed
-            (<literal>MyISAM</literal> only).
+            updates for the table until the table is closed. See the
+            description of the <literal>delay_key_write</literal> system
+            variable in <xref linkend="server-system-variables"/>.
+            (<literal>MyISAM</literal> only.)
           </para>
         </listitem>
 
@@ -2276,9 +2282,9 @@
           </para>
 
           <para>
-            Defines how the rows should be stored. Currently this option
-            works only with <literal>MyISAM</literal> tables. The option
-            value can <literal>FIXED</literal> or
+            Defines how the rows should be stored. Currently, this
+            option works only with <literal>MyISAM</literal> tables. The
+            option value can be <literal>FIXED</literal> or
             <literal>DYNAMIC</literal> for static or variable-length row
             format. <command>myisampack</command> sets the type to
             <literal>COMPRESSED</literal>. See
@@ -2356,10 +2362,10 @@
           </para>
 
           <para>
-            <literal>UNION</literal> is used when you want to use a
-            collection of identical tables as one. This works only with
-            <literal>MERGE</literal> tables. See
-            <xref linkend="merge-storage-engine"/>.
+            <literal>UNION</literal> is used when you want to access a
+            collection of identical <literal>MyISAM</literal> tables as
+            one. This works only with <literal>MERGE</literal> tables.
+            See <xref linkend="merge-storage-engine"/>.
           </para>
 
           <para>
@@ -2405,9 +2411,9 @@
             or <literal>INDEX
             DIRECTORY='<replaceable>directory</replaceable>'</literal>
             you can specify where the <literal>MyISAM</literal> storage
-            engine should put a table's data file and index file. Note
-            that the directory should be a full path to the directory
-            (not a relative path).
+            engine should put a table's data file and index file. The
+            directory must be the full pathname to the directory, not a
+            relative path.
           </para>
 
           <para>
@@ -2532,9 +2538,9 @@
 
 <programlisting>
 CREATE TABLE artists_and_works
-SELECT artist.name, COUNT(work.artist_id) AS number_of_works
-FROM artist LEFT JOIN work ON artist.id = work.artist_id
-GROUP BY artist.id;
+  SELECT artist.name, COUNT(work.artist_id) AS number_of_works
+  FROM artist LEFT JOIN work ON artist.id = work.artist_id
+  GROUP BY artist.id;
 </programlisting>
 
       <para>
@@ -2558,7 +2564,7 @@
 </programlisting>
 
       <para>
-        <literal>CREATE TABLE ... LIKE</literal> does not copy any
+        <literal>CREATE TABLE ... LIKE</literal> does not preserve any
         <literal>DATA DIRECTORY</literal> or <literal>INDEX
         DIRECTORY</literal> table options that were specified for the
         original table, or any foreign key definitions.
@@ -14451,7 +14457,7 @@
 State: NULL
 Info: SHOW FULL PROCESSLIST
 5 rows in set (0.00 sec)
-          </programlisting>
+</programlisting>
 
           The columns have the following meaning:
 
@@ -17419,13 +17425,13 @@
         <remark role="help-syntax"/>
 
 <programlisting>
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER = <replaceable>n</replaceable>
+SET GLOBAL SQL_SLAVE_SKIP_COUNTER = <replaceable>N</replaceable>
 </programlisting>
 
         <remark role="help-description-begin"/>
 
         <para>
-          Skip the next <replaceable>n</replaceable> events from the
+          Skip the next <replaceable>N</replaceable> events from the
           master. This is useful for recovering from replication stops
           caused by a statement.
         </para>

Modified: trunk/refman-5.0/apis.xml
===================================================================
--- trunk/refman-5.0/apis.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.0/apis.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -8986,12 +8986,12 @@
       <para>
         Each <literal>Prepare</literal> and <literal>Execute</literal>
         line in the log is tagged with a
-        <literal>[<replaceable>n</replaceable>]</literal> statement
+        <literal>[<replaceable>N</replaceable>]</literal> statement
         identifier so that you can keep track of which prepared
-        statement is being logged. <replaceable>n</replaceable> is a
+        statement is being logged. <replaceable>N</replaceable> is a
         positive integer. If there are multiple prepared statements
         active simultaneously for the client,
-        <replaceable>n</replaceable> may be greater than 1. Each
+        <replaceable>N</replaceable> may be greater than 1. Each
         <literal>Execute</literal> lines shows a prepared statement
         after substitution of data values for <literal>?</literal>
         parameters.
@@ -8999,7 +8999,7 @@
 
       <para>
         Version notes: <literal>Prepare</literal> lines are displayed
-        without <literal>[<replaceable>n</replaceable>]</literal> before
+        without <literal>[<replaceable>N</replaceable>]</literal> before
         MySQL 4.1.10. <literal>Execute</literal> lines are not displayed
         at all before MySQL 4.1.10.
       </para>

Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.0/charset.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -1055,8 +1055,8 @@
       </para>
 
 <programlisting>
-CREATE TABLE t1 (f1 CHAR(<replaceable>n</replaceable>) UNICODE);
-CREATE TABLE t1 (f1 CHAR(<replaceable>n</replaceable>) CHARACTER SET ucs2);
+CREATE TABLE t1 (f1 CHAR(<replaceable>N</replaceable>) UNICODE);
+CREATE TABLE t1 (f1 CHAR(<replaceable>N</replaceable>) CHARACTER SET ucs2);
 </programlisting>
 
     </section>

Modified: trunk/refman-5.0/client-utility-programs.xml
===================================================================
--- trunk/refman-5.0/client-utility-programs.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.0/client-utility-programs.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -1194,14 +1194,8 @@
             <para>
               Uses the same technique as <option>-r</option> and
               <option>-n</option>, but creates all the keys in parallel,
-              using different threads.
-
-              <remark role="todo">
-                Is this still the case in 5.0?
-              </remark>
-
-              <emphasis>This is beta-quality code. Use at your own
-              risk!</emphasis>
+              using different threads. <emphasis>This is beta-quality
+              code. Use at your own risk!</emphasis>
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/connector-odbc.xml
===================================================================
--- trunk/refman-5.0/connector-odbc.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.0/connector-odbc.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -3602,8 +3602,8 @@
                 to be able to update. For maximum portability, don't use
                 a length specification in the column declaration. That
                 is, use <literal>TIMESTAMP</literal>, not
-                <literal>TIMESTAMP(<replaceable>n</replaceable>)</literal>,
-                <replaceable>n</replaceable> &lt; 14.
+                <literal>TIMESTAMP(<replaceable>N</replaceable>)</literal>,
+                <replaceable>N</replaceable> &lt; 14.
               </para>
             </listitem>
 
@@ -4689,8 +4689,8 @@
             be able to update. For maximum portability, don't use a
             length specification in the column declaration. That is, use
             <literal>TIMESTAMP</literal>, not
-            <literal>TIMESTAMP(<replaceable>n</replaceable>)</literal>,
-            <replaceable>n</replaceable> &lt; 14.
+            <literal>TIMESTAMP(<replaceable>N</replaceable>)</literal>,
+            <replaceable>N</replaceable> &lt; 14.
           </para>
         </listitem>
 

Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.0/data-types.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -1982,8 +1982,8 @@
 
         <listitem>
           <para>
-            If strict mode is not enabled, MySQL sets the column to the
-            implicit default value for the column data type.
+            If strict SQL mode is not enabled, MySQL sets the column to
+            the implicit default value for the column data type.
           </para>
         </listitem>
 

Modified: trunk/refman-5.0/innodb.xml
===================================================================
--- trunk/refman-5.0/innodb.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.0/innodb.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -2230,7 +2230,7 @@
       <para>
         Beginning with MySQL 5.0.3, <literal>InnoDB</literal> supports
         the <literal>AUTO_INCREMENT =
-        <replaceable>n</replaceable></literal> table option in
+        <replaceable>N</replaceable></literal> table option in
         <literal>CREATE TABLE</literal> and <literal>ALTER
         TABLE</literal> statements, to set the initial counter value or
         alter the current counter value. The effect of this option is

Modified: trunk/refman-5.0/replication.xml
===================================================================
--- trunk/refman-5.0/replication.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.0/replication.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -4157,12 +4157,12 @@
             </para>
 
 <programlisting>
-mysql&gt; <userinput>SET GLOBAL SQL_SLAVE_SKIP_COUNTER = <replaceable>n</replaceable>;</userinput>
+mysql&gt; <userinput>SET GLOBAL SQL_SLAVE_SKIP_COUNTER = <replaceable>N</replaceable>;</userinput>
 mysql&gt; <userinput>START SLAVE;</userinput>
 </programlisting>
 
             <para>
-              The value of <replaceable>n</replaceable> should be 1 if
+              The value of <replaceable>N</replaceable> should be 1 if
               the next statement from the master does not use
               <literal>AUTO_INCREMENT</literal> or
               <literal>LAST_INSERT_ID()</literal>. Otherwise, the value

Modified: trunk/refman-5.0/spatial-extensions.xml
===================================================================
--- trunk/refman-5.0/spatial-extensions.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.0/spatial-extensions.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -3558,11 +3558,11 @@
                 <primary>PointN()</primary>
               </indexterm>
 
-              <literal>PointN(<replaceable>ls</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>PointN(<replaceable>ls</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
 
             <para>
-              Returns the <replaceable>n</replaceable>-th
+              Returns the <replaceable>N</replaceable>-th
               <literal>Point</literal> in the
               <literal>Linestring</literal> value
               <replaceable>ls</replaceable>. Points are numbered
@@ -3829,11 +3829,11 @@
                 <primary>InteriorRingN()</primary>
               </indexterm>
 
-              <literal>InteriorRingN(<replaceable>poly</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>InteriorRingN(<replaceable>poly</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
 
             <para>
-              Returns the <replaceable>n</replaceable>-th interior ring
+              Returns the <replaceable>N</replaceable>-th interior ring
               for the <literal>Polygon</literal> value
               <replaceable>poly</replaceable> as a
               <literal>LineString</literal>. Rings are numbered
@@ -4002,11 +4002,11 @@
                 <primary>GeometryN()</primary>
               </indexterm>
 
-              <literal>GeometryN(<replaceable>gc</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>GeometryN(<replaceable>gc</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
 
             <para>
-              Returns the <replaceable>n</replaceable>-th geometry in
+              Returns the <replaceable>N</replaceable>-th geometry in
               the <literal>GeometryCollection</literal> value
               <replaceable>gc</replaceable>. Geometries are numbered
               beginning with 1.
@@ -4107,7 +4107,7 @@
 
           <listitem>
             <para>
-              <literal>PointN(<replaceable>ls</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>PointN(<replaceable>ls</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
           </listitem>
 
@@ -4119,13 +4119,13 @@
 
           <listitem>
             <para>
-              <literal>InteriorRingN(<replaceable>poly</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>InteriorRingN(<replaceable>poly</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>GeometryN(<replaceable>gc</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>GeometryN(<replaceable>gc</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
           </listitem>
 

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -1541,6 +1541,14 @@
 
         <listitem>
           <para>
+            The attribute <literal>SERIAL</literal> can be used as an
+            alias for <literal>BIGINT UNSIGNED NOT NULL AUTO_INCREMENT
+            UNIQUE</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             Character data types (<literal>CHAR</literal>,
             <literal>VARCHAR</literal>, <literal>TEXT</literal>) can
             include <literal>CHARACTER SET</literal> and
@@ -1646,14 +1654,6 @@
 
         <listitem>
           <para>
-            The attribute <literal>SERIAL</literal> can be used as an
-            alias for <literal>BIGINT UNSIGNED NOT NULL AUTO_INCREMENT
-            UNIQUE</literal>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
             <literal>KEY</literal> is normally a synonym for
             <literal>INDEX</literal>. The key attribute <literal>PRIMARY
             KEY</literal> can also be specified as just
@@ -1665,14 +1665,15 @@
 
         <listitem>
           <para>
-            A <literal>UNIQUE</literal> index is one in which all values
-            in the index must be distinct. An error occurs if you try to
-            add a new row with a key that matches an existing row. The
-            exception to this is that if a column in the index is
-            allowed to contain <literal>NULL</literal> values, it can
-            contain multiple <literal>NULL</literal> values. This
-            exception does not apply to <literal>BDB</literal> tables,
-            for which an indexed column allows only a single
+            A <literal>UNIQUE</literal> index creates a constraint such
+            that all values in the index must be distinct. An error
+            occurs if you try to add a new row with a key that matches
+            an existing row. The exception to this is that if a column
+            in the index is allowed to contain <literal>NULL</literal>
+            values, it can contain multiple <literal>NULL</literal>
+            values. This exception does not apply to
+            <literal>BDB</literal> tables, for which a column with a
+            <literal>UNIQUE</literal> index allows only a single
             <literal>NULL</literal>.
           </para>
         </listitem>
@@ -1683,16 +1684,16 @@
               <primary>PRIMARY KEY</primary>
             </indexterm>
 
-            A <literal>PRIMARY KEY</literal> is a unique
-            <literal>KEY</literal> where all key columns must be defined
-            as <literal>NOT NULL</literal>. If they are not explicitly
-            declared as <literal>NOT NULL</literal>, MySQL declares them
-            so implicitly (and silently). A table can have only one
-            <literal>PRIMARY KEY</literal>. If you do not have a
-            <literal>PRIMARY KEY</literal> and an application asks for
-            the <literal>PRIMARY KEY</literal> in your tables, MySQL
-            returns the first <literal>UNIQUE</literal> index that has
-            no <literal>NULL</literal> columns as the <literal>PRIMARY
+            A <literal>PRIMARY KEY</literal> is a unique index where all
+            key columns must be defined as <literal>NOT NULL</literal>.
+            If they are not explicitly declared as <literal>NOT
+            NULL</literal>, MySQL declares them so implicitly (and
+            silently). A table can have only one <literal>PRIMARY
+            KEY</literal>. If you do not have a <literal>PRIMARY
+            KEY</literal> and an application asks for the
+            <literal>PRIMARY KEY</literal> in your tables, MySQL returns
+            the first <literal>UNIQUE</literal> index that has no
+            <literal>NULL</literal> columns as the <literal>PRIMARY
             KEY</literal>.
           </para>
         </listitem>
@@ -1721,6 +1722,10 @@
 
         <listitem>
           <para>
+            <indexterm>
+              <primary><literal>_rowid</literal></primary>
+            </indexterm>
+
             If a <literal>PRIMARY KEY</literal> or
             <literal>UNIQUE</literal> index consists of only one column
             that has an integer type, you can also refer to the column
@@ -1748,7 +1753,8 @@
             Some storage engines allow you to specify an index type when
             creating an index. The syntax for the
             <replaceable>index_type</replaceable> specifier is
-            <literal>USING type_name</literal>.
+            <literal>USING
+            <replaceable>type_name</replaceable></literal>.
           </para>
 
           <para>
@@ -1831,10 +1837,10 @@
           </indexterm>
 
           <para>
-            The <literal>MyISAM</literal> and <literal>InnoDB</literal>
-            storage engines also support indexing on
-            <literal>BLOB</literal> and <literal>TEXT</literal> columns.
-            When indexing a <literal>BLOB</literal> or
+            The <literal>MyISAM</literal>, <literal>BDB</literal>, and
+            <literal>InnoDB</literal> storage engines support indexing
+            on <literal>BLOB</literal> and <literal>TEXT</literal>
+            columns. When indexing a <literal>BLOB</literal> or
             <literal>TEXT</literal> column, you
             <emphasis>must</emphasis> specify a prefix length for the
             index. For example:
@@ -1849,7 +1855,9 @@
             <literal>InnoDB</literal> tables). Note that prefix limits
             are measured in bytes, whereas the prefix length in
             <literal>CREATE TABLE</literal> statements is interpreted as
-            number of characters. Be sure to take this into account when
+            number of characters for non-binary data types
+            (<literal>CHAR</literal>, <literal>VARCHAR</literal>,
+            <literal>TEXT</literal>). Take this into account when
             specifying a prefix length for a column that uses a
             multi-byte character set.
           </para>
@@ -1919,12 +1927,11 @@
           </para>
 
           <para>
-            For other storage engines, MySQL Server parses the
-            <literal>FOREIGN KEY</literal> and
+            For other storage engines, MySQL Server parses and ignores
+            the <literal>FOREIGN KEY</literal> and
             <literal>REFERENCES</literal> syntax in <literal>CREATE
-            TABLE</literal> statements, but without further action being
-            taken. The <literal>CHECK</literal> clause is parsed but
-            ignored by all storage engines. See
+            TABLE</literal> statements. The <literal>CHECK</literal>
+            clause is parsed but ignored by all storage engines. See
             <xref linkend="ansi-diff-foreign-keys"/>.
           </para>
         </listitem>
@@ -2053,11 +2060,12 @@
 
       <para>
         If a storage engine is specified that is not available, MySQL
-        uses <literal>MyISAM</literal> instead. For example, if a table
-        definition includes the <literal>ENGINE=BDB</literal> option but
-        the MySQL server does not support <literal>BDB</literal> tables,
-        the table is created as a <literal>MyISAM</literal> table. This
-        makes it possible to have a replication setup where you have
+        uses the default engine instead. Normally, this is
+        <literal>MyISAM</literal>. For example, if a table definition
+        includes the <literal>ENGINE=BDB</literal> option but the MySQL
+        server does not support <literal>BDB</literal> tables, the table
+        is created as a <literal>MyISAM</literal> table. This makes it
+        possible to have a replication setup where you have
         transactional tables on the master but tables created on the
         slave are non-transactional (to get more speed). In MySQL
         &current-series;, a warning occurs if the storage engine
@@ -2067,7 +2075,7 @@
       <para>
         The other table options are used to optimize the behavior of the
         table. In most cases, you do not have to specify any of them.
-        These options work for all storage engines unless otherwise
+        These options apply to all storage engines unless otherwise
         indicated:
       </para>
 
@@ -2096,7 +2104,7 @@
             <literal>AUTO_INCREMENT</literal> table option in
             <literal>CREATE TABLE</literal> statements, you can also use
             <literal>ALTER TABLE <replaceable>tbl_name</replaceable>
-            AUTO_INCREMENT = <replaceable>n</replaceable></literal> to
+            AUTO_INCREMENT = <replaceable>N</replaceable></literal> to
             reset the <literal>AUTO_INCREMENT</literal> value.
           </para>
         </listitem>
@@ -2119,17 +2127,16 @@
             the resulting table is. If you don't specify either option,
             the maximum size for a table is 65,536TB of data (4GB before
             MySQL 5.0.6). (If your operating system does not support
-            files that large, table sizes are constrained by the
-            operating system limit.) If you want to keep down the
-            pointer sizes to make the index smaller and faster and you
-            don't really need big files, you can decrease the default
-            pointer size by setting the
-            <literal>myisam_data_pointer_size</literal> system variable,
-            which was added in MySQL 4.1.2. (See
+            files that large, table sizes are constrained by the file
+            size limit.) If you want to keep down the pointer sizes to
+            make the index smaller and faster and you don't really need
+            big files, you can decrease the default pointer size by
+            setting the <literal>myisam_data_pointer_size</literal>
+            system variable, which was added in MySQL 4.1.2. (See
             <xref linkend="server-system-variables"/>.) If you want all
             your tables to be able to grow above the default limit and
             are willing to have your tables slightly slower and larger
-            than necessary, you may increase the default pointer size by
+            than necessary, you can increase the default pointer size by
             setting this variable.
           </para>
         </listitem>
@@ -2141,12 +2148,9 @@
 
           <para>
             Specify a default character set for the table.
-            <literal>CHARSET</literal> is a synonym for this.
+            <literal>CHARSET</literal> is a synonym for
+            <literal>CHARACTER SET</literal>.
           </para>
-
-          <para>
-            for <literal>CHARACTER SET</literal>.
-          </para>
         </listitem>
 
         <listitem>
@@ -2170,8 +2174,8 @@
             automatically as the table changes). This makes the table a
             little slower to update, but also makes it easier to find
             corrupted tables. The <literal>CHECKSUM TABLE</literal>
-            statement reports the checksum (<literal>MyISAM</literal>
-            only).
+            statement reports the checksum. (<literal>MyISAM</literal>
+            only.)
           </para>
         </listitem>
 
@@ -2231,13 +2235,13 @@
             the option to 0 disables all packing of keys. Setting it to
             <literal>DEFAULT</literal> tells the storage engine to pack
             only long <literal>CHAR</literal> or
-            <literal>VARCHAR</literal> columns
-            (<literal>MyISAM</literal> only).
+            <literal>VARCHAR</literal> columns.
+            (<literal>MyISAM</literal> only.)
           </para>
 
           <para>
             If you do not use <literal>PACK_KEYS</literal>, the default
-            is to pack only strings, but not numbers. If you use
+            is to pack strings, but not numbers. If you use
             <literal>PACK_KEYS=1</literal>, numbers are packed as well.
           </para>
 
@@ -2288,8 +2292,7 @@
 
           <para>
             Encrypt the <filename>.frm</filename> file with a password.
-            This option does not do anything in the standard MySQL
-            version.
+            This option does nothing in the standard MySQL version.
           </para>
         </listitem>
 
@@ -2300,8 +2303,10 @@
 
           <para>
             Set this to <literal>1</literal> if you want to delay key
-            updates for the table until the table is closed
-            (<literal>MyISAM</literal> only).
+            updates for the table until the table is closed. See the
+            description of the <literal>delay_key_write</literal> system
+            variable in <xref linkend="server-system-variables"/>.
+            (<literal>MyISAM</literal> only.)
           </para>
         </listitem>
 
@@ -2311,18 +2316,18 @@
           </para>
 
           <para>
-            Defines how the rows should be stored. Currently this option
-            works only with <literal>MyISAM</literal> tables. The option
-            value can <literal>FIXED</literal> or
-            <literal>DYNAMIC</literal> for static or variable-length row
-            format. <command>myisampack</command> sets the type to
+            Defines how the rows should be stored. For
+            <literal>MyISAM</literal> tables, the option value can be
+            <literal>FIXED</literal> or <literal>DYNAMIC</literal> for
+            static or variable-length row format.
+            <command>myisampack</command> sets the type to
             <literal>COMPRESSED</literal>. See
             <xref linkend="myisam-table-formats"/>.
           </para>
 
           <para>
-            Starting with MySQL/InnoDB-5.0.3, <literal>InnoDB</literal>
-            rows are stored in compact format
+            Starting with MySQL 5.0.3, for <literal>InnoDB</literal>
+            tables, rows are stored in compact format
             (<literal>ROW_FORMAT=COMPACT</literal>) by default. The
             non-compact format used in older versions of MySQL can still
             be requested by specifying
@@ -2348,10 +2353,10 @@
           </para>
 
           <para>
-            <literal>UNION</literal> is used when you want to use a
-            collection of identical tables as one. This works only with
-            <literal>MERGE</literal> tables. See
-            <xref linkend="merge-storage-engine"/>.
+            <literal>UNION</literal> is used when you want to access a
+            collection of identical <literal>MyISAM</literal> tables as
+            one. This works only with <literal>MERGE</literal> tables.
+            See <xref linkend="merge-storage-engine"/>.
           </para>
 
           <para>
@@ -2395,9 +2400,9 @@
             or <literal>INDEX
             DIRECTORY='<replaceable>directory</replaceable>'</literal>
             you can specify where the <literal>MyISAM</literal> storage
-            engine should put a table's data file and index file. Note
-            that the directory should be a full path to the directory
-            (not a relative path).
+            engine should put a table's data file and index file. The
+            directory must be the full pathname to the directory, not a
+            relative path.
           </para>
 
           <para>
@@ -2521,9 +2526,9 @@
 
 <programlisting>
 CREATE TABLE artists_and_works
-SELECT artist.name, COUNT(work.artist_id) AS number_of_works
-FROM artist LEFT JOIN work ON artist.id = work.artist_id
-GROUP BY artist.id;
+  SELECT artist.name, COUNT(work.artist_id) AS number_of_works
+  FROM artist LEFT JOIN work ON artist.id = work.artist_id
+  GROUP BY artist.id;
 </programlisting>
 
       <para>
@@ -2545,7 +2550,7 @@
 </programlisting>
 
       <para>
-        <literal>CREATE TABLE ... LIKE</literal> does not copy any
+        <literal>CREATE TABLE ... LIKE</literal> does not preserve any
         <literal>DATA DIRECTORY</literal> or <literal>INDEX
         DIRECTORY</literal> table options that were specified for the
         original table, or any foreign key definitions.
@@ -2788,7 +2793,8 @@
         database and deletes the database. Be <emphasis>very</emphasis>
         careful with this statement! To use <literal>DROP
         DATABASE</literal>, you need the <literal>DROP</literal>
-        privilege on the database.
+        privilege on the database. <literal>DROP SCHEMA</literal> is a
+        synonym for <literal>DROP DATABASE</literal> as of MySQL 5.0.2.
       </para>
 
       <para>
@@ -2796,10 +2802,6 @@
         occurring if the database does not exist.
       </para>
 
-      <para>
-        <literal>DROP SCHEMA</literal> can be used as of MySQL 5.0.2.
-      </para>
-
       <remark role="help-description-end"/>
 
       <para>
@@ -15684,7 +15686,7 @@
 State: NULL
 Info: SHOW FULL PROCESSLIST
 5 rows in set (0.00 sec)
-          </programlisting>
+</programlisting>
 
           The columns have the following meaning:
 
@@ -18864,13 +18866,13 @@
         <remark role="help-syntax"/>
 
 <programlisting>
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER = <replaceable>n</replaceable>
+SET GLOBAL SQL_SLAVE_SKIP_COUNTER = <replaceable>N</replaceable>
 </programlisting>
 
         <remark role="help-description-begin"/>
 
         <para>
-          Skip the next <replaceable>n</replaceable> events from the
+          Skip the next <replaceable>N</replaceable> events from the
           master. This is useful for recovering from replication stops
           caused by a statement.
         </para>

Modified: trunk/refman-5.1/apis.xml
===================================================================
--- trunk/refman-5.1/apis.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.1/apis.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -8991,12 +8991,12 @@
       <para>
         Each <literal>Prepare</literal> and <literal>Execute</literal>
         line in the log is tagged with a
-        <literal>[<replaceable>n</replaceable>]</literal> statement
+        <literal>[<replaceable>N</replaceable>]</literal> statement
         identifier so that you can keep track of which prepared
-        statement is being logged. <replaceable>n</replaceable> is a
+        statement is being logged. <replaceable>N</replaceable> is a
         positive integer. If there are multiple prepared statements
         active simultaneously for the client,
-        <replaceable>n</replaceable> may be greater than 1. Each
+        <replaceable>N</replaceable> may be greater than 1. Each
         <literal>Execute</literal> lines shows a prepared statement
         after substitution of data values for <literal>?</literal>
         parameters.
@@ -9004,7 +9004,7 @@
 
       <para>
         Version notes: <literal>Prepare</literal> lines are displayed
-        without <literal>[<replaceable>n</replaceable>]</literal> before
+        without <literal>[<replaceable>N</replaceable>]</literal> before
         MySQL 4.1.10. <literal>Execute</literal> lines are not displayed
         at all before MySQL 4.1.10.
       </para>

Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.1/charset.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -1055,8 +1055,8 @@
       </para>
 
 <programlisting>
-CREATE TABLE t1 (f1 CHAR(<replaceable>n</replaceable>) UNICODE);
-CREATE TABLE t1 (f1 CHAR(<replaceable>n</replaceable>) CHARACTER SET ucs2);
+CREATE TABLE t1 (f1 CHAR(<replaceable>N</replaceable>) UNICODE);
+CREATE TABLE t1 (f1 CHAR(<replaceable>N</replaceable>) CHARACTER SET ucs2);
 </programlisting>
 
     </section>

Modified: trunk/refman-5.1/client-utility-programs.xml
===================================================================
--- trunk/refman-5.1/client-utility-programs.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.1/client-utility-programs.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -1207,14 +1207,8 @@
             <para>
               Uses the same technique as <option>-r</option> and
               <option>-n</option>, but creates all the keys in parallel,
-              using different threads.
-
-              <remark role="todo">
-                Is this still the case in 5.1?
-              </remark>
-
-              <emphasis>This is beta-quality code. Use at your own
-              risk!</emphasis>
+              using different threads. <emphasis>This is beta-quality
+              code. Use at your own risk!</emphasis>
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/connector-odbc.xml
===================================================================
--- trunk/refman-5.1/connector-odbc.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.1/connector-odbc.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -3602,8 +3602,8 @@
                 to be able to update. For maximum portability, don't use
                 a length specification in the column declaration. That
                 is, use <literal>TIMESTAMP</literal>, not
-                <literal>TIMESTAMP(<replaceable>n</replaceable>)</literal>,
-                <replaceable>n</replaceable> &lt; 14.
+                <literal>TIMESTAMP(<replaceable>N</replaceable>)</literal>,
+                <replaceable>N</replaceable> &lt; 14.
               </para>
             </listitem>
 
@@ -4689,8 +4689,8 @@
             be able to update. For maximum portability, don't use a
             length specification in the column declaration. That is, use
             <literal>TIMESTAMP</literal>, not
-            <literal>TIMESTAMP(<replaceable>n</replaceable>)</literal>,
-            <replaceable>n</replaceable> &lt; 14.
+            <literal>TIMESTAMP(<replaceable>N</replaceable>)</literal>,
+            <replaceable>N</replaceable> &lt; 14.
           </para>
         </listitem>
 

Modified: trunk/refman-5.1/data-types.xml
===================================================================
--- trunk/refman-5.1/data-types.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.1/data-types.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -1832,8 +1832,7 @@
       <para>
         If the column can take <literal>NULL</literal> as a value, the
         column is defined with an explicit <literal>DEFAULT
-        NULL</literal> clause. (This is the same as in earlier versions
-        of MySQL.)
+        NULL</literal> clause.
       </para>
 
       <para>
@@ -1849,8 +1848,8 @@
 
         <listitem>
           <para>
-            If strict mode is not enabled, MySQL sets the column to the
-            implicit default value for the column data type.
+            If strict SQL mode is not enabled, MySQL sets the column to
+            the implicit default value for the column data type.
           </para>
         </listitem>
 

Modified: trunk/refman-5.1/innodb.xml
===================================================================
--- trunk/refman-5.1/innodb.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.1/innodb.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -2205,7 +2205,7 @@
 
       <para>
         <literal>InnoDB</literal> supports the <literal>AUTO_INCREMENT =
-        <replaceable>n</replaceable></literal> table option in
+        <replaceable>N</replaceable></literal> table option in
         <literal>CREATE TABLE</literal> and <literal>ALTER
         TABLE</literal> statements, to set the initial counter value or
         alter the current counter value. The effect of this option is

Modified: trunk/refman-5.1/replication.xml
===================================================================
--- trunk/refman-5.1/replication.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.1/replication.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -4659,12 +4659,12 @@
               </para>
 
 <programlisting>
-mysql&gt; <userinput>SET GLOBAL SQL_SLAVE_SKIP_COUNTER = <replaceable>n</replaceable>;</userinput>
+mysql&gt; <userinput>SET GLOBAL SQL_SLAVE_SKIP_COUNTER = <replaceable>N</replaceable>;</userinput>
 mysql&gt; <userinput>START SLAVE;</userinput>
 </programlisting>
 
               <para>
-                The value of <replaceable>n</replaceable> should be 1 if
+                The value of <replaceable>N</replaceable> should be 1 if
                 the next statement from the master does not use
                 <literal>AUTO_INCREMENT</literal> or
                 <literal>LAST_INSERT_ID()</literal>. Otherwise, the

Modified: trunk/refman-5.1/spatial-extensions.xml
===================================================================
--- trunk/refman-5.1/spatial-extensions.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.1/spatial-extensions.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -3556,11 +3556,11 @@
                 <primary>PointN()</primary>
               </indexterm>
 
-              <literal>PointN(<replaceable>ls</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>PointN(<replaceable>ls</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
 
             <para>
-              Returns the <replaceable>n</replaceable>-th
+              Returns the <replaceable>N</replaceable>-th
               <literal>Point</literal> in the
               <literal>Linestring</literal> value
               <replaceable>ls</replaceable>. Points are numbered
@@ -3827,11 +3827,11 @@
                 <primary>InteriorRingN()</primary>
               </indexterm>
 
-              <literal>InteriorRingN(<replaceable>poly</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>InteriorRingN(<replaceable>poly</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
 
             <para>
-              Returns the <replaceable>n</replaceable>-th interior ring
+              Returns the <replaceable>N</replaceable>-th interior ring
               for the <literal>Polygon</literal> value
               <replaceable>poly</replaceable> as a
               <literal>LineString</literal>. Rings are numbered
@@ -4000,11 +4000,11 @@
                 <primary>GeometryN()</primary>
               </indexterm>
 
-              <literal>GeometryN(<replaceable>gc</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>GeometryN(<replaceable>gc</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
 
             <para>
-              Returns the <replaceable>n</replaceable>-th geometry in
+              Returns the <replaceable>N</replaceable>-th geometry in
               the <literal>GeometryCollection</literal> value
               <replaceable>gc</replaceable>. Geometries are numbered
               beginning with 1.
@@ -4105,7 +4105,7 @@
 
           <listitem>
             <para>
-              <literal>PointN(<replaceable>ls</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>PointN(<replaceable>ls</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
           </listitem>
 
@@ -4117,13 +4117,13 @@
 
           <listitem>
             <para>
-              <literal>InteriorRingN(<replaceable>poly</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>InteriorRingN(<replaceable>poly</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
           </listitem>
 
           <listitem>
             <para>
-              <literal>GeometryN(<replaceable>gc</replaceable>,<replaceable>n</replaceable>)</literal>
+              <literal>GeometryN(<replaceable>gc</replaceable>,<replaceable>N</replaceable>)</literal>
             </para>
           </listitem>
 

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-26 18:12:22 UTC (rev 1046)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-26 18:26:10 UTC (rev 1047)
@@ -1796,6 +1796,14 @@
 
         <listitem>
           <para>
+            The attribute <literal>SERIAL</literal> can be used as an
+            alias for <literal>BIGINT UNSIGNED NOT NULL AUTO_INCREMENT
+            UNIQUE</literal>.
+          </para>
+        </listitem>
+
+        <listitem>
+          <para>
             Character data types (<literal>CHAR</literal>,
             <literal>VARCHAR</literal>, <literal>TEXT</literal>) can
             include <literal>CHARACTER SET</literal> and
@@ -1902,14 +1910,6 @@
 
         <listitem>
           <para>
-            The attribute <literal>SERIAL</literal> can be used as an
-            alias for <literal>BIGINT UNSIGNED NOT NULL AUTO_INCREMENT
-            UNIQUE</literal>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
             <literal>KEY</literal> is normally a synonym for
             <literal>INDEX</literal>. The key attribute <literal>PRIMARY
             KEY</literal> can also be specified as just
@@ -1921,14 +1921,15 @@
 
         <listitem>
           <para>
-            A <literal>UNIQUE</literal> index is one in which all values
-            in the index must be distinct. An error occurs if you try to
-            add a new row with a key that matches an existing row. The
-            exception to this is that if a column in the index is
-            allowed to contain <literal>NULL</literal> values, it can
-            contain multiple <literal>NULL</literal> values. This
-            exception does not apply to <literal>BDB</literal> tables,
-            for which an indexed column allows only a single
+            A <literal>UNIQUE</literal> index creates a constraint such
+            that all values in the index must be distinct. An error
+            occurs if you try to add a new row with a key that matches
+            an existing row. The exception to this is that if a column
+            in the index is allowed to contain <literal>NULL</literal>
+            values, it can contain multiple <literal>NULL</literal>
+            values. This exception does not apply to
+            <literal>BDB</literal> tables, for which a column with a
+            <literal>UNIQUE</literal> index allows only a single
             <literal>NULL</literal>.
           </para>
         </listitem>
@@ -1939,16 +1940,16 @@
               <primary>PRIMARY KEY</primary>
             </indexterm>
 
-            A <literal>PRIMARY KEY</literal> is a unique
-            <literal>KEY</literal> where all key columns must be defined
-            as <literal>NOT NULL</literal>. If they are not explicitly
-            declared as <literal>NOT NULL</literal>, MySQL declares them
-            so implicitly (and silently). A table can have only one
-            <literal>PRIMARY KEY</literal>. If you do not have a
-            <literal>PRIMARY KEY</literal> and an application asks for
-            the <literal>PRIMARY KEY</literal> in your tables, MySQL
-            returns the first <literal>UNIQUE</literal> index that has
-            no <literal>NULL</literal> columns as the <literal>PRIMARY
+            A <literal>PRIMARY KEY</literal> is a unique index where all
+            key columns must be defined as <literal>NOT NULL</literal>.
+            If they are not explicitly declared as <literal>NOT
+            NULL</literal>, MySQL declares them so implicitly (and
+            silently). A table can have only one <literal>PRIMARY
+            KEY</literal>. If you do not have a <literal>PRIMARY
+            KEY</literal> and an application asks for the
+            <literal>PRIMARY KEY</literal> in your tables, MySQL returns
+            the first <literal>UNIQUE</literal> index that has no
+            <literal>NULL</literal> columns as the <literal>PRIMARY
             KEY</literal>.
           </para>
         </listitem>
@@ -1977,6 +1978,10 @@
 
         <listitem>
           <para>
+            <indexterm>
+              <primary><literal>_rowid</literal></primary>
+            </indexterm>
+
             If a <literal>PRIMARY KEY</literal> or
             <literal>UNIQUE</literal> index consists of only one column
             that has an integer type, you can also refer to the column
@@ -2004,7 +2009,8 @@
             Some storage engines allow you to specify an index type when
             creating an index. The syntax for the
             <replaceable>index_type</replaceable> specifier is
-            <literal>USING type_name</literal>.
+            <literal>USING
+            <replaceable>type_name</replaceable></literal>.
           </para>
 
           <para>
@@ -2087,10 +2093,10 @@
           </indexterm>
 
           <para>
-            The <literal>MyISAM</literal> and <literal>InnoDB</literal>
-            storage engines also support indexing on
-            <literal>BLOB</literal> and <literal>TEXT</literal> columns.
-            When indexing a <literal>BLOB</literal> or
+            The <literal>MyISAM</literal>, <literal>BDB</literal>, and
+            <literal>InnoDB</literal> storage engines support indexing
+            on <literal>BLOB</literal> and <literal>TEXT</literal>
+            columns. When indexing a <literal>BLOB</literal> or
             <literal>TEXT</literal> column, you
             <emphasis>must</emphasis> specify a prefix length for the
             index. For example:
@@ -2105,7 +2111,9 @@
             <literal>InnoDB</literal> tables). Note that prefix limits
             are measured in bytes, whereas the prefix length in
             <literal>CREATE TABLE</literal> statements is interpreted as
-            number of characters. Be sure to take this into account when
+            number of characters for non-binary data types
+            (<literal>CHAR</literal>, <literal>VARCHAR</literal>,
+            <literal>TEXT</literal>). Take this into account when
             specifying a prefix length for a column that uses a
             multi-byte character set.
           </para>
@@ -2181,12 +2189,11 @@
           </para>
 
           <para>
-            For other storage engines, MySQL Server parses the
-            <literal>FOREIGN KEY</literal> and
+            For other storage engines, MySQL Server parses and ignores
+            the <literal>FOREIGN KEY</literal> and
             <literal>REFERENCES</literal> syntax in <literal>CREATE
-            TABLE</literal> statements, but without further action being
-            taken. The <literal>CHECK</literal> clause is parsed but
-            ignored by all storage engines. See
+            TABLE</literal> statements. The <literal>CHECK</literal>
+            clause is parsed but ignored by all storage engines. See
             <xref linkend="ansi-diff-foreign-keys"/>.
           </para>
         </listitem>
@@ -2315,11 +2322,12 @@
 
       <para>
         If a storage engine is specified that is not available, MySQL
-        uses <literal>MyISAM</literal> instead. For example, if a table
-        definition includes the <literal>ENGINE=BDB</literal> option but
-        the MySQL server does not support <literal>BDB</literal> tables,
-        the table is created as a <literal>MyISAM</literal> table. This
-        makes it possible to have a replication setup where you have
+        uses the default engine instead. Normally, this is
+        <literal>MyISAM</literal>. For example, if a table definition
+        includes the <literal>ENGINE=BDB</literal> option but the MySQL
+        server does not support <literal>BDB</literal> tables, the table
+        is created as a <literal>MyISAM</literal> table. This makes it
+        possible to have a replication setup where you have
         transactional tables on the master but tables created on the
         slave are non-transactional (to get more speed). In MySQL
         &current-series;, a warning occurs if the storage engine
@@ -2329,7 +2337,7 @@
       <para>
         The other table options are used to optimize the behavior of the
         table. In most cases, you do not have to specify any of them.
-        These options work for all storage engines unless otherwise
+        These options apply to all storage engines unless otherwise
         indicated:
       </para>
 
@@ -2343,10 +2351,9 @@
           <para>
             The initial <literal>AUTO_INCREMENT</literal> value for the
             table. In MySQL &current-series;, this works for
-            <literal>MyISAM</literal> and <literal>MEMORY</literal>
-            tables only. It is also supported for
-            <literal>InnoDB</literal>. To set the first auto-increment
-            value for engines that do not support the
+            <literal>MyISAM</literal>, <literal>MEMORY</literal>, and
+            <literal>InnoDB</literal> tables. To set the first
+            auto-increment value for engines that do not support the
             <literal>AUTO_INCREMENT</literal> table option, insert a
             <quote>dummy</quote> row with a value one less than the
             desired value after creating the table, and then delete the
@@ -2358,7 +2365,7 @@
             <literal>AUTO_INCREMENT</literal> table option in
             <literal>CREATE TABLE</literal> statements, you can also use
             <literal>ALTER TABLE <replaceable>tbl_name</replaceable>
-            AUTO_INCREMENT = <replaceable>n</replaceable></literal> to
+            AUTO_INCREMENT = <replaceable>N</replaceable></literal> to
             reset the <literal>AUTO_INCREMENT</literal> value.
           </para>
         </listitem>
@@ -2381,15 +2388,15 @@
             the resulting table is. If you don't specify either option,
             the maximum size for a table is 65,536TB of data. (If your
             operating system does not support files that large, table
-            sizes are constrained by the operating system limit.) If you
-            want to keep down the pointer sizes to make the index
-            smaller and faster and you don't really need big files, you
-            can decrease the default pointer size by setting the
+            sizes are constrained by the file size limit.) If you want
+            to keep down the pointer sizes to make the index smaller and
+            faster and you don't really need big files, you can decrease
+            the default pointer size by setting the
             <literal>myisam_data_pointer_size</literal> system variable.
             (See <xref linkend="server-system-variables"/>.) If you want
             all your tables to be able to grow above the default limit
             and are willing to have your tables slightly slower and
-            larger than necessary, you may increase the default pointer
+            larger than necessary, you can increase the default pointer
             size by setting this variable.
           </para>
         </listitem>
@@ -2401,12 +2408,9 @@
 
           <para>
             Specify a default character set for the table.
-            <literal>CHARSET</literal> is a synonym for this.
+            <literal>CHARSET</literal> is a synonym for
+            <literal>CHARACTER SET</literal>.
           </para>
-
-          <para>
-            for <literal>CHARACTER SET</literal>.
-          </para>
         </listitem>
 
         <listitem>
@@ -2430,8 +2434,8 @@
             automatically as the table changes). This makes the table a
             little slower to update, but also makes it easier to find
             corrupted tables. The <literal>CHECKSUM TABLE</literal>
-            statement reports the checksum (<literal>MyISAM</literal>
-            only).
+            statement reports the checksum. (<literal>MyISAM</literal>
+            only.)
           </para>
         </listitem>
 
@@ -2454,7 +2458,7 @@
             The connection string for a <literal>FEDERATED</literal>
             table. (<emphasis role="bold">Note</emphasis>: Older
             versions of MySQL used a <literal>COMMENT</literal> option
-            for the connection string.
+            for the connection string.)
           </para>
         </listitem>
 
@@ -2491,13 +2495,13 @@
             the option to 0 disables all packing of keys. Setting it to
             <literal>DEFAULT</literal> tells the storage engine to pack
             only long <literal>CHAR</literal> or
-            <literal>VARCHAR</literal> columns
-            (<literal>MyISAM</literal> only).
+            <literal>VARCHAR</literal> columns.
+            (<literal>MyISAM</literal> only.)
           </para>
 
           <para>
             If you do not use <literal>PACK_KEYS</literal>, the default
-            is to pack only strings, but not numbers. If you use
+            is to pack strings, but not numbers. If you use
             <literal>PACK_KEYS=1</literal>, numbers are packed as well.
           </para>
 
@@ -2548,8 +2552,7 @@
 
           <para>
             Encrypt the <filename>.frm</filename> file with a password.
-            This option does not do anything in the standard MySQL
-            version.
+            This option does nothing in the standard MySQL version.
           </para>
         </listitem>
 
@@ -2560,8 +2563,10 @@
 
           <para>
             Set this to <literal>1</literal> if you want to delay key
-            updates for the table until the table is closed
-            (<literal>MyISAM</literal> only).
+            updates for the table until the table is closed. See the
+            description of the <literal>delay_key_write</literal> system
+            variable in <xref linkend="server-system-variables"/>.
+            (<literal>MyISAM</literal> only.)
           </para>
         </listitem>
 
@@ -2571,20 +2576,20 @@
           </para>
 
           <para>
-            Defines how the rows should be stored. Currently this option
-            works only with <literal>MyISAM</literal> tables. The option
-            value can <literal>FIXED</literal> or
-            <literal>DYNAMIC</literal> for static or variable-length row
-            format. <command>myisampack</command> sets the type to
+            Defines how the rows should be stored. For
+            <literal>MyISAM</literal> tables, the option value can be
+            <literal>FIXED</literal> or <literal>DYNAMIC</literal> for
+            static or variable-length row format.
+            <command>myisampack</command> sets the type to
             <literal>COMPRESSED</literal>. See
             <xref linkend="myisam-table-formats"/>.
           </para>
 
           <para>
-            <literal>InnoDB</literal> rows are stored in compact format
-            (<literal>ROW_FORMAT=COMPACT</literal>) by default. The
-            non-compact format used in older versions of MySQL can still
-            be requested by specifying
+            For <literal>InnoDB</literal> tables, rows are stored in
+            compact format (<literal>ROW_FORMAT=COMPACT</literal>) by
+            default. The non-compact format used in older versions of
+            MySQL can still be requested by specifying
             <literal>ROW_FORMAT=REDUNDANT</literal>.
           </para>
         </listitem>
@@ -2607,10 +2612,10 @@
           </para>
 
           <para>
-            <literal>UNION</literal> is used when you want to use a
-            collection of identical tables as one. This works only with
-            <literal>MERGE</literal> tables. See
-            <xref linkend="merge-storage-engine"/>.
+            <literal>UNION</literal> is used when you want to access a
+            collection of identical <literal>MyISAM</literal> tables as
+            one. This works only with <literal>MERGE</literal> tables.
+            See <xref linkend="merge-storage-engine"/>.
           </para>
 
           <para>
@@ -2654,9 +2659,9 @@
             or <literal>INDEX
             DIRECTORY='<replaceable>directory</replaceable>'</literal>
             you can specify where the <literal>MyISAM</literal> storage
-            engine should put a table's data file and index file. Note
-            that the directory should be a full path to the directory
-            (not a relative path).
+            engine should put a table's data file and index file. The
+            directory must be the full pathname to the directory, not a
+            relative path.
           </para>
 
           <para>
@@ -2675,17 +2680,20 @@
             control partitioning of the table created with
             <literal>CREATE TABLE</literal>, and if used, must contain
             at a minimum a <literal>PARTITION BY</literal> clause. This
-            clause contains the function which is used to determine the
+            clause contains the function that is used to determine the
             partition; the function returns an integer value ranging
             from 1 to <replaceable>num</replaceable>, where
             <replaceable>num</replaceable> is the number of partitions.
-            The choices available for this function which are available
-            in MySQL &current-series; are shown in the following list.
+            The choices that are available for this function in MySQL
+            &current-series; are shown in the following list.
+          </para>
+
+          <para>
             <emphasis role="bold">Important</emphasis>: Not all options
             shown in the syntax for
             <replaceable>partition_options</replaceable> at the
             beginning of this section are available for all partitioning
-            types. Please see the following listings for the individual
+            types. Please see the listings for the following individual
             types for information specific to each type, and see
             <xref linkend="partitioning"/>, for more complete
             information about the workings of and uses for partitioning
@@ -2760,11 +2768,11 @@
 </programlisting>
 
               <para>
-                You can employ linear partitioning with tables which are
-                partitioned by key, by using the
+                For tables that are partitioned by key, you can employ
+                linear partitioning by using the
                 <literal>LINEAR</literal> keyword. This has the same
                 effect as with tables that are partitioned by
-                <literal>HASH</literal>; that is, the partition number
+                <literal>HASH</literal>. That is, the partition number
                 is found using the <literal>&amp;</literal> operator
                 rather than the modulus (see
                 <xref linkend="partitioning-linear-hash"/>, and
@@ -2793,7 +2801,7 @@
                 using a set of <literal>VALUES LESS THAN</literal>
                 operators. When using range partitioning, you must
                 define at least one partition using <literal>VALUES LESS
-                THAN</literal>. You cannot use<literal>VALUES
+                THAN</literal>. You cannot use <literal>VALUES
                 IN</literal> with range partitioning.
               </para>
 
@@ -2815,7 +2823,7 @@
                   <colspec colwidth="60*"/>
                   <tbody>
                     <row>
-                      <entry><emphasis role="bold">Partition #</emphasis>:</entry>
+                      <entry><emphasis role="bold">Partition Number</emphasis>:</entry>
                       <entry><emphasis role="bold">Years Range</emphasis>:</entry>
                     </row>
                     <row>
@@ -2854,7 +2862,7 @@
 
 <programlisting>
 CREATE TABLE t1 (
-    year_col INT, 
+    year_col  INT, 
     some_data INT 
 ) 
 PARTITION BY RANGE (year_col) (
@@ -2911,7 +2919,7 @@
 
 <programlisting>
 CREATE TABLE client_firms (
-    id INT,
+    id   INT,
     name VARCHAR(35)
 )
 PARTITION BY LIST (id) (
@@ -3032,32 +3040,40 @@
                 <filename><replaceable>data_dir</replaceable></filename>
                 and the
                 <filename><replaceable>index_dir</replaceable></filename>
-                must be absolute system paths. Example:
+                must be absolute system pathnames. Example:
               </para>
 
 <programlisting>
 CREATE TABLE th (id INT, name VARCHAR(30), adate DATE)
 PARTITION BY LIST(YEAR(adate))
 (
-    PARTITION p1999 VALUES IN (1995, 1999, 2003) DATA DIRECTORY = '<filename>/var/appdata/95/data</filename>' INDEX DIRECTORY = '<filename>/var/appdata/95/idx</filename>',
-    PARTITION p2000 VALUES IN (1996, 2000, 2004) DATA DIRECTORY = '<filename>/var/appdata/96/data</filename>' INDEX DIRECTORY = '<filename>/var/appdata/96/idx</filename>',
-    PARTITION p2001 VALUES IN (1997, 2001, 2005) DATA DIRECTORY = '<filename>/var/appdata/97/data</filename>' INDEX DIRECTORY = '<filename>/var/appdata/97/idx</filename>',
-    PARTITION p2000 VALUES IN (1998, 2002, 2006) DATA DIRECTORY = '<filename>/var/appdata/98/data</filename>' INDEX DIRECTORY = '<filename>/var/appdata/98/idx</filename>'
-);</programlisting>
+  PARTITION p1999 VALUES IN (1995, 1999, 2003)
+    DATA DIRECTORY = '<filename>/var/appdata/95/data</filename>'
+    INDEX DIRECTORY = '<filename>/var/appdata/95/idx</filename>',
+  PARTITION p2000 VALUES IN (1996, 2000, 2004)
+    DATA DIRECTORY = '<filename>/var/appdata/96/data</filename>'
+    INDEX DIRECTORY = '<filename>/var/appdata/96/idx</filename>',
+  PARTITION p2001 VALUES IN (1997, 2001, 2005)
+    DATA DIRECTORY = '<filename>/var/appdata/97/data</filename>'
+    INDEX DIRECTORY = '<filename>/var/appdata/97/idx</filename>',
+  PARTITION p2000 VALUES IN (1998, 2002, 2006)
+    DATA DIRECTORY = '<filename>/var/appdata/98/data</filename>'
+    INDEX DIRECTORY = '<filename>/var/appdata/98/idx</filename>'
+);
+</programlisting>
 
               <para>
                 <literal>DATA DIRECTORY</literal> and <literal>INDEX
                 DIRECTORY</literal> behave in the same way as in the
                 <literal>CREATE TABLE</literal> statement's
                 <replaceable>table_option</replaceable> clause as used
-                for tables under the <literal>MyISAM</literal> table
-                handler.
+                for <literal>MyISAM</literal> tables.
               </para>
 
               <para>
                 One data directory and one index directory may be
                 specified per partition. If left unspecified, the data
-                and indexes are stored in the default MySQL data
+                and indexes are stored by default in the MySQL data
                 directory.
               </para>
             </listitem>
@@ -3092,13 +3108,13 @@
             <listitem>
               <para>
                 The optional <literal>[STORAGE] ENGINE</literal> clause
-                causes the tables in this partition to be of the type
-                specified, which may be of any type supported by this
-                MySQL server. Both the <literal>STORAGE</literal>
+                causes the tables in this partition to use the storage
+                engine specified, which may be any engine supported by
+                this MySQL server. Both the <literal>STORAGE</literal>
                 keyword and the equals sign (<literal>=</literal>) are
                 optional. If no partition-specific storage engine is set
-                using this option then the engine applying to the table
-                as a whole is used for this partition.
+                using this option, the engine applying to the table as a
+                whole is used for this partition.
               </para>
 
               <para>
@@ -3274,9 +3290,9 @@
 
 <programlisting>
 CREATE TABLE artists_and_works
-SELECT artist.name, COUNT(work.artist_id) AS number_of_works
-FROM artist LEFT JOIN work ON artist.id = work.artist_id
-GROUP BY artist.id;
+  SELECT artist.name, COUNT(work.artist_id) AS number_of_works
+  FROM artist LEFT JOIN work ON artist.id = work.artist_id
+  GROUP BY artist.id;
 </programlisting>
 
       <para>
@@ -3298,7 +3314,7 @@
 </programlisting>
 
       <para>
-        <literal>CREATE TABLE ... LIKE</literal> does not copy any
+        <literal>CREATE TABLE ... LIKE</literal> does not preserve any
         <literal>DATA DIRECTORY</literal> or <literal>INDEX
         DIRECTORY</literal> table options that were specified for the
         original table, or any foreign key definitions.
@@ -3375,7 +3391,8 @@
         database and deletes the database. Be <emphasis>very</emphasis>
         careful with this statement! To use <literal>DROP
         DATABASE</literal>, you need the <literal>DROP</literal>
-        privilege on the database.
+        privilege on the database. <literal>DROP SCHEMA</literal> is a
+        synonym for <literal>DROP DATABASE</literal>.
       </para>
 
       <para>
@@ -3383,10 +3400,6 @@
         occurring if the database does not exist.
       </para>
 
-      <para>
-        <literal>DROP SCHEMA</literal> can also be used.
-      </para>
-
       <remark role="help-description-end"/>
 
       <para>
@@ -16209,7 +16222,7 @@
 State: NULL
 Info: SHOW FULL PROCESSLIST
 5 rows in set (0.00 sec)
-          </programlisting>
+</programlisting>
 
           The columns have the following meaning:
 
@@ -19378,13 +19391,13 @@
         <remark role="help-syntax"/>
 
 <programlisting>
-SET GLOBAL SQL_SLAVE_SKIP_COUNTER = <replaceable>n</replaceable>
+SET GLOBAL SQL_SLAVE_SKIP_COUNTER = <replaceable>N</replaceable>
 </programlisting>
 
         <remark role="help-description-begin"/>
 
         <para>
-          Skip the next <replaceable>n</replaceable> events from the
+          Skip the next <replaceable>N</replaceable> events from the
           master. This is useful for recovering from replication stops
           caused by a statement.
         </para>

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