List:Commits« Previous MessageNext Message »
From:paul.dubois Date:October 29 2008 9:10pm
Subject:svn commit - mysqldoc@docsrva: r12196 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0 refman-common
View as plain text  
Author: paul
Date: 2008-10-29 21:10:08 +0100 (Wed, 29 Oct 2008)
New Revision: 12196

Log:
 r35090@frost:  paul | 2008-10-29 15:08:50 -0500
 Reformat


Modified:
   trunk/refman-4.1/apis-c.xml
   trunk/refman-4.1/backup.xml
   trunk/refman-4.1/data-types.xml
   trunk/refman-4.1/dba-core.xml
   trunk/refman-4.1/errors-problems.xml
   trunk/refman-4.1/functions-core.xml
   trunk/refman-4.1/installing.xml
   trunk/refman-4.1/internationalization.xml
   trunk/refman-4.1/introduction.xml
   trunk/refman-4.1/language-structure.xml
   trunk/refman-4.1/mysql-cluster-configuration.xml
   trunk/refman-4.1/mysql-cluster-faq.xml
   trunk/refman-4.1/mysql-cluster-limitations.xml
   trunk/refman-4.1/mysql-cluster-multi-computer.xml
   trunk/refman-4.1/news-3.20.xml
   trunk/refman-4.1/news-3.21.xml
   trunk/refman-4.1/news-3.22.xml
   trunk/refman-4.1/news-3.23.xml
   trunk/refman-4.1/news-4.0.xml
   trunk/refman-4.1/optimization.xml
   trunk/refman-4.1/programs-admin-util.xml
   trunk/refman-4.1/programs-client.xml
   trunk/refman-4.1/replication.xml
   trunk/refman-4.1/se-innodb-core.xml
   trunk/refman-4.1/spatial-extensions.xml
   trunk/refman-4.1/sql-syntax-data-definition.xml
   trunk/refman-4.1/sql-syntax-data-manipulation.xml
   trunk/refman-4.1/sql-syntax-prepared-statements.xml
   trunk/refman-4.1/sql-syntax-replication.xml
   trunk/refman-4.1/sql-syntax-server-administration.xml
   trunk/refman-4.1/sql-syntax-transactions.xml
   trunk/refman-4.1/sql-syntax-utility.xml
   trunk/refman-4.1/storage-engines.xml
   trunk/refman-4.1/tutorial.xml
   trunk/refman-5.0/apis-c.xml
   trunk/refman-5.0/backup.xml
   trunk/refman-5.0/data-types.xml
   trunk/refman-5.0/dba-core.xml
   trunk/refman-5.0/errors-problems.xml
   trunk/refman-5.0/faqs.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35089
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33695
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:35090
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:33695


Modified: trunk/refman-4.1/apis-c.xml
===================================================================
--- trunk/refman-4.1/apis-c.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/apis-c.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 2, Lines Added: 14, Lines Deleted: 13; 2201 bytes

@@ -8322,12 +8322,12 @@
 
     <para>
       The following statements can be used as prepared statements:
-      <literal role="stmt">CREATE TABLE</literal>,
<literal>DELETE</literal>,
-      <literal>DO</literal>, <literal>INSERT</literal>,
-      <literal>REPLACE</literal>, <literal>SELECT</literal>,
-      <literal>SET</literal>, <literal>UPDATE</literal>, and most
-      <literal>SHOW</literal> statements. Other statements are not yet
-      supported.
+      <literal role="stmt">CREATE TABLE</literal>,
+      <literal>DELETE</literal>, <literal>DO</literal>,
+      <literal>INSERT</literal>, <literal>REPLACE</literal>,
+      <literal>SELECT</literal>, <literal>SET</literal>,
+      <literal>UPDATE</literal>, and most <literal>SHOW</literal>
+      statements. Other statements are not yet supported.
     </para>
 
     <formalpara role="mnmas-kb">

@@ -9099,13 +9099,14 @@
 
       <listitem>
         <para>
-          If you fetch an SQL <literal role="type">MEDIUMINT</literal> column
value,
-          but specify a <literal>buffer_type</literal> value of
-          <literal>MYSQL_TYPE_LONGLONG</literal> and use a C variable of
-          type <literal>long long int</literal> as the destination
-          buffer, MySQL will convert the <literal
role="type">MEDIUMINT</literal>
-          value (which requires less than 8 bytes) for storage into the
-          <literal>long long int</literal> (an 8-byte variable).
+          If you fetch an SQL <literal role="type">MEDIUMINT</literal>
+          column value, but specify a <literal>buffer_type</literal>
+          value of <literal>MYSQL_TYPE_LONGLONG</literal> and use a C
+          variable of type <literal>long long int</literal> as the
+          destination buffer, MySQL will convert the
+          <literal role="type">MEDIUMINT</literal> value (which requires
+          less than 8 bytes) for storage into the <literal>long long
+          int</literal> (an 8-byte variable).
         </para>
       </listitem>
 


Modified: trunk/refman-4.1/backup.xml
===================================================================
--- trunk/refman-4.1/backup.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/backup.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 4; 1451 bytes

@@ -93,8 +93,8 @@
         <emphasis role="bold">Logical versus physical (raw)
         backups.</emphasis> Logical backups save information represented
         as logical database structure (<literal>CREATE
-        DATABASE</literal>, <literal role="stmt">CREATE TABLE</literal>
statements)
-        and content (<literal>INSERT</literal> statements or
+        DATABASE</literal>, <literal role="stmt">CREATE TABLE</literal>
+        statements) and content (<literal>INSERT</literal> statements or
         delimited-text files). Physical backups consist of raw copies of
         the directories and files that store database contents.
       </para>

@@ -1803,8 +1803,9 @@
       <para>
         Note that error 135 (no more room in record file) and error 136
         (no more room in index file) are not errors that can be fixed by
-        a simple repair. In this case, you must use <literal role="stmt">ALTER
-        TABLE</literal> to increase the <literal>MAX_ROWS</literal> and
+        a simple repair. In this case, you must use
+        <literal role="stmt">ALTER TABLE</literal> to increase the
+        <literal>MAX_ROWS</literal> and
         <literal>AVG_ROW_LENGTH</literal> table option values:
       </para>
 


Modified: trunk/refman-4.1/data-types.xml
===================================================================
--- trunk/refman-4.1/data-types.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/data-types.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 17, Lines Added: 68, Lines Deleted: 58; 11693 bytes

@@ -474,7 +474,8 @@
           </para>
 
           <para>
-            This type is a synonym for <literal role="type">INT</literal>.
+            This type is a synonym for
+            <literal role="type">INT</literal>.
           </para>
 
           <remark role="help-description-end"/>

@@ -537,19 +538,21 @@
                 </indexterm>
 
                 All arithmetic is done using signed
-                <literal role="type">BIGINT</literal> or
<literal>DOUBLE</literal>
-                values, so you should not use unsigned big integers
-                larger than <literal>9223372036854775807</literal> (63
-                bits) except with bit functions! If you do that, some of
-                the last digits in the result may be wrong because of
-                rounding errors when converting a
+                <literal role="type">BIGINT</literal> or
+                <literal>DOUBLE</literal> values, so you should not use
+                unsigned big integers larger than
+                <literal>9223372036854775807</literal> (63 bits) except
+                with bit functions! If you do that, some of the last
+                digits in the result may be wrong because of rounding
+                errors when converting a
                 <literal role="type">BIGINT</literal> value to a
                 <literal>DOUBLE</literal>.
               </para>
 
               <para>
-                MySQL 4.0 can handle <literal role="type">BIGINT</literal> in
the
-                following cases:
+                MySQL 4.0 can handle
+                <literal role="type">BIGINT</literal> in the following
+                cases:
               </para>
 
               <itemizedlist>

@@ -588,10 +591,10 @@
             <listitem>
               <para>
                 You can always store an exact integer value in a
-                <literal role="type">BIGINT</literal> column by storing it
using a
-                string. In this case, MySQL performs a string-to-number
-                conversion that involves no intermediate
-                double-precision representation.
+                <literal role="type">BIGINT</literal> column by storing
+                it using a string. In this case, MySQL performs a
+                string-to-number conversion that involves no
+                intermediate double-precision representation.
               </para>
             </listitem>
 

@@ -600,11 +603,11 @@
                 The <literal role="op" condition="minus">-</literal>,
                 <literal role="op" condition="plus">+</literal>, and
                 <literal role="op" condition="times">*</literal>
-                operators use <literal role="type">BIGINT</literal>
arithmetic when
-                both operands are integer values. This means that if you
-                multiply two big integers (or results from functions
-                that return integers), you may get unexpected results
-                when the result is larger than
+                operators use <literal role="type">BIGINT</literal>
+                arithmetic when both operands are integer values. This
+                means that if you multiply two big integers (or results
+                from functions that return integers), you may get
+                unexpected results when the result is larger than
                 <literal>9223372036854775807</literal>.
               </para>
             </listitem>

@@ -1245,9 +1248,9 @@
 
       <para>
         In some cases, MySQL may change a string column to a type
-        different from that given in a <literal role="stmt">CREATE
TABLE</literal>
-        or <literal role="stmt">ALTER TABLE</literal> statement. See
-        <xref linkend="silent-column-changes"/>.
+        different from that given in a <literal role="stmt">CREATE
+        TABLE</literal> or <literal role="stmt">ALTER TABLE</literal>
+        statement. See <xref linkend="silent-column-changes"/>.
       </para>
 
       <para>

@@ -2202,7 +2205,8 @@
     <para>
       MySQL supports all of the standard SQL numeric data types. These
       types include the exact numeric data types
-      (<literal>INTEGER</literal>, <literal
role="type">SMALLINT</literal>,
+      (<literal>INTEGER</literal>,
+      <literal role="type">SMALLINT</literal>,
       <literal>DECIMAL</literal>, and
<literal>NUMERIC</literal>), as
       well as the approximate numeric data types
       (<literal>FLOAT</literal>, <literal>REAL</literal>, and

@@ -2223,9 +2227,9 @@
     <para>
       As an extension to the SQL standard, MySQL also supports the
       integer types <literal role="type">TINYINT</literal>,
-      <literal role="type">MEDIUMINT</literal>, and <literal
role="type">BIGINT</literal>. The
-      following table shows the required storage and range for each of
-      the integer types.
+      <literal role="type">MEDIUMINT</literal>, and
+      <literal role="type">BIGINT</literal>. The following table shows
+      the required storage and range for each of the integer types.
     </para>
 
     <informaltable>

@@ -2326,9 +2330,10 @@
       of digits that are displayed for values having a width exceeding
       that specified for the column. For example, a column specified as
       <literal>SMALLINT(3)</literal> has the usual
-      <literal role="type">SMALLINT</literal> range of
<literal>-32768</literal> to
-      <literal>32767</literal>, and values outside the range allowed by
-      three characters are displayed using more than three characters.
+      <literal role="type">SMALLINT</literal> range of
+      <literal>-32768</literal> to <literal>32767</literal>, and
values
+      outside the range allowed by three characters are displayed using
+      more than three characters.
     </para>
 
     <para>

@@ -2357,10 +2362,10 @@
       <literal>UNSIGNED</literal>. Unsigned values can be used when you
       want to allow only non-negative numbers in a column and you need a
       larger upper numeric range for the column. For example, if an
-      <literal role="type">INT</literal> column is
<literal>UNSIGNED</literal>, the
-      size of the column's range is the same but its endpoints shift
-      from <literal>-2147483648</literal> and
-      <literal>2147483647</literal> up to <literal>0</literal>
and
+      <literal role="type">INT</literal> column is
+      <literal>UNSIGNED</literal>, the size of the column's range is the
+      same but its endpoints shift from <literal>-2147483648</literal>
+      and <literal>2147483647</literal> up to
<literal>0</literal> and
       <literal>4294967295</literal>.
     </para>
 

@@ -2559,12 +2564,12 @@
       For example, when an out-of-range value is assigned to an integer
       column, MySQL stores the value representing the corresponding
       endpoint of the column data type range. If you store 256 into a
-      <literal role="type">TINYINT</literal> or <literal>TINYINT
UNSIGNED</literal>
-      column, MySQL stores 127 or 255, respectively. When a
-      floating-point or fixed-point column is assigned a value that
-      exceeds the range implied by the specified (or default) precision
-      and scale, MySQL stores the value representing the corresponding
-      endpoint of that range.
+      <literal role="type">TINYINT</literal> or <literal>TINYINT
+      UNSIGNED</literal> column, MySQL stores 127 or 255, respectively.
+      When a floating-point or fixed-point column is assigned a value
+      that exceeds the range implied by the specified (or default)
+      precision and scale, MySQL stores the value representing the
+      corresponding endpoint of that range.
     </para>
 
     <para>

@@ -2603,9 +2608,10 @@
 
     <para>
       Conversions that occur due to clipping are reported as
-      <quote>warnings</quote> for <literal role="stmt">ALTER
TABLE</literal>,
-      <literal>LOAD DATA INFILE</literal>,
<literal>UPDATE</literal>,
-      and multiple-row <literal>INSERT</literal> statements.
+      <quote>warnings</quote> for <literal role="stmt">ALTER
+      TABLE</literal>, <literal>LOAD DATA INFILE</literal>,
+      <literal>UPDATE</literal>, and multiple-row
+      <literal>INSERT</literal> statements.
     </para>
 
   </section>

@@ -3405,9 +3411,10 @@
 
           <listitem>
             <para>
-              If you use <literal role="stmt">ALTER TABLE</literal> to widen
a
-              narrow <literal>TIMESTAMP</literal> column, information is
-              displayed that previously was <quote>hidden.</quote>
+              If you use <literal role="stmt">ALTER TABLE</literal> to
+              widen a narrow <literal>TIMESTAMP</literal> column,
+              information is displayed that previously was
+              <quote>hidden.</quote>
             </para>
           </listitem>
 

@@ -3434,8 +3441,8 @@
               widths of 6 or more, which will produce a legal display
               format. You can change the display width of
               <literal>TIMESTAMP</literal> data types, without losing
-              any information, by using <literal role="stmt">ALTER
TABLE</literal>
-              as indicated above.
+              any information, by using <literal role="stmt">ALTER
+              TABLE</literal> as indicated above.
             </para>
 
             <para>

@@ -3669,9 +3676,9 @@
 
           <listitem>
             <para>
-              In a <literal role="stmt">CREATE TABLE</literal> statement, the
first
-              <literal>TIMESTAMP</literal> column can be declared in any
-              of the following ways:
+              In a <literal role="stmt">CREATE TABLE</literal>
+              statement, the first <literal>TIMESTAMP</literal> column
+              can be declared in any of the following ways:
             </para>
 
             <itemizedlist>

@@ -5105,8 +5112,9 @@
 </programlisting>
 
       <para>
-        However, this version of the previous <literal role="stmt">CREATE
-        TABLE</literal> statement does <emphasis>not</emphasis> work:
+        However, this version of the previous
+        <literal role="stmt">CREATE TABLE</literal> statement does
+        <emphasis>not</emphasis> work:
       </para>
 
 <programlisting>

@@ -5695,10 +5703,12 @@
         <literal>NDB</literal> table. This requirement applies in
         addition to any other considerations that are discussed in this
         section. For example, in <literal>NDBCLUSTER</literal> tables,
-        the <literal role="type">TINYINT</literal>, <literal
role="type">SMALLINT</literal>,
-        <literal role="type">MEDIUMINT</literal>, and
<literal>INTEGER</literal>
-        (<literal role="type">INT</literal>) column types each require 4
bytes
-        storage per record due to the alignment factor.
+        the <literal role="type">TINYINT</literal>,
+        <literal role="type">SMALLINT</literal>,
+        <literal role="type">MEDIUMINT</literal>, and
+        <literal>INTEGER</literal> (<literal
role="type">INT</literal>)
+        column types each require 4 bytes storage per record due to the
+        alignment factor.
       </para>
 
       <para>

@@ -6199,9 +6209,9 @@
 
     <para>
       For high precision, you can always convert to a fixed-point type
-      stored in a <literal role="type">BIGINT</literal>. This allows you to
do all
-      calculations with 64-bit integers and then convert results back to
-      floating-point values only when necessary.
+      stored in a <literal role="type">BIGINT</literal>. This allows you
+      to do all calculations with 64-bit integers and then convert
+      results back to floating-point values only when necessary.
     </para>
 
     <para>


Modified: trunk/refman-4.1/dba-core.xml
===================================================================
--- trunk/refman-4.1/dba-core.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/dba-core.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 11, Lines Added: 36, Lines Deleted: 32; 7218 bytes

@@ -1365,7 +1365,8 @@
           <para>
             Log slow administrative statements such as <literal>OPTIMIZE
             TABLE</literal>, <literal>ANALYZE TABLE</literal>, and
-            <literal role="stmt">ALTER TABLE</literal> to the slow query log.
+            <literal role="stmt">ALTER TABLE</literal> to the slow query
+            log.
           </para>
 
           <para>

@@ -2449,10 +2450,11 @@
                 a <literal>MyISAM</literal> index file or data file to
                 another directory with the <literal>INDEX
                 DIRECTORY</literal> or <literal>DATA
DIRECTORY</literal>
-                options of the <literal role="stmt">CREATE TABLE</literal>
-                statement. If you delete or rename the table, the files
-                that its symbolic links point to also are deleted or
-                renamed. See <xref linkend="symbolic-links-to-tables"/>.
+                options of the <literal role="stmt">CREATE
+                TABLE</literal> statement. If you delete or rename the
+                table, the files that its symbolic links point to also
+                are deleted or renamed. See
+                <xref linkend="symbolic-links-to-tables"/>.
               </para>
             </listitem>
 

@@ -3546,8 +3548,8 @@
             This option applies only to <literal>MyISAM</literal>
             tables. It can have one of the following values to affect
             handling of the <literal>DELAY_KEY_WRITE</literal> table
-            option that can be used in <literal role="stmt">CREATE
TABLE</literal>
-            statements.
+            option that can be used in <literal role="stmt">CREATE
+            TABLE</literal> statements.
           </para>
 
           <informaltable>

@@ -3566,8 +3568,8 @@
                 <row>
                   <entry><literal>ON</literal></entry>
                   <entry>MySQL honors any
<literal>DELAY_KEY_WRITE</literal> option specified in
-                    <literal role="stmt">CREATE TABLE</literal> statements.
This is
-                    the default value.</entry>
+                    <literal role="stmt">CREATE TABLE</literal>
+                    statements. This is the default value.</entry>
                 </row>
                 <row>
                   <entry><literal>ALL</literal></entry>

@@ -4785,12 +4787,12 @@
             <literal>MAX_ROWS</literal> values. Setting this variable
             has no effect on any existing <literal>MEMORY</literal>
             table, unless the table is re-created with a statement such
-            as <literal role="stmt">CREATE TABLE</literal>, or altered with
-            <literal role="stmt">ALTER TABLE</literal> or
<literal>TRUNCATE
-            TABLE</literal>. A server restart also sets the maximum size
-            of existing <literal>MEMORY</literal> tables to the global
-            <literal>max_heap_table_size</literal> value. This variable
-            was added in MySQL 3.23.0.
+            as <literal role="stmt">CREATE TABLE</literal>, or altered
+            with <literal role="stmt">ALTER TABLE</literal> or
+            <literal>TRUNCATE TABLE</literal>. A server restart also
+            sets the maximum size of existing <literal>MEMORY</literal>
+            tables to the global <literal>max_heap_table_size</literal>
+            value. This variable was added in MySQL 3.23.0.
           </para>
 
           <formalpara role="mnmas">

@@ -5050,11 +5052,12 @@
           <para>
             The maximum size of the temporary file that MySQL is allowed
             to use while re-creating a <literal>MyISAM</literal> index
-            (during <literal>REPAIR TABLE</literal>, <literal
role="stmt">ALTER
-            TABLE</literal>, or <literal>LOAD DATA INFILE</literal>).
If
-            the file size would be larger than this value, the index is
-            created using the key cache instead, which is slower. This
-            variable was added in MySQL 3.23.37.
+            (during <literal>REPAIR TABLE</literal>,
+            <literal role="stmt">ALTER TABLE</literal>, or
<literal>LOAD
+            DATA INFILE</literal>). If the file size would be larger
+            than this value, the index is created using the key cache
+            instead, which is slower. This variable was added in MySQL
+            3.23.37.
           </para>
 
           <note>

@@ -5113,8 +5116,9 @@
             The size of the buffer that is allocated when sorting
             <literal>MyISAM</literal> indexes during a <literal>REPAIR
             TABLE</literal> or when creating indexes with
-            <literal>CREATE INDEX</literal> or <literal
role="stmt">ALTER
-            TABLE</literal>. This variable was added in MySQL 3.23.16.
+            <literal>CREATE INDEX</literal> or
+            <literal role="stmt">ALTER TABLE</literal>. This variable
+            was added in MySQL 3.23.16.
           </para>
         </listitem>
 

@@ -6681,9 +6685,9 @@
             affects data definition statements: <literal>DROP
             DATABASE</literal> drops a database even if it contains
             tables that have foreign keys that are referred to by tables
-            outside the database, and <literal role="stmt">DROP
TABLE</literal>
-            drops tables that have foreign keys that are referred to by
-            other tables.
+            outside the database, and <literal role="stmt">DROP
+            TABLE</literal> drops tables that have foreign keys that are
+            referred to by other tables.
           </para>
 
           <note>

@@ -6721,8 +6725,8 @@
 
           <para>
             Set the value to be used by the following
-            <literal>INSERT</literal> or <literal role="stmt">ALTER
TABLE</literal>
-            statement when inserting an
+            <literal>INSERT</literal> or <literal role="stmt">ALTER
+            TABLE</literal> statement when inserting an
             <literal>AUTO_INCREMENT</literal> value. This is mainly used
             with the binary log.
           </para>

@@ -10999,9 +11003,9 @@
       <para>
         In MySQL 4.0, slow administrative statements such as
         <literal>OPTIMIZE TABLE</literal>, <literal>ANALYZE
-        TABLE</literal>, and <literal role="stmt">ALTER TABLE</literal>
were written
-        to the slow query log. This logging was disabled in MySQL 4.1
-        until 4.1.13, when the
+        TABLE</literal>, and <literal role="stmt">ALTER TABLE</literal>
+        were written to the slow query log. This logging was disabled in
+        MySQL 4.1 until 4.1.13, when the
         <option>--log-slow-admin-statements</option> server option was
         added to specify logging of slow administrative statements.
       </para>

@@ -13289,8 +13293,8 @@
 
       <para>
         The <literal>ALTER</literal> privilege enables you to use
-        <literal role="stmt">ALTER TABLE</literal> to change the structure of
or
-        rename tables.
+        <literal role="stmt">ALTER TABLE</literal> to change the
+        structure of or rename tables.
       </para>
 
       <para>


Modified: trunk/refman-4.1/errors-problems.xml
===================================================================
--- trunk/refman-4.1/errors-problems.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/errors-problems.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 14, Lines Added: 66, Lines Deleted: 60; 11759 bytes

@@ -1880,8 +1880,9 @@
             <para>
               If you need a <literal>MyISAM</literal> table that is
               larger than the default limit and your operating system
-              supports large files, the <literal role="stmt">CREATE
TABLE</literal>
-              statement supports <literal>AVG_ROW_LENGTH</literal> and
+              supports large files, the <literal role="stmt">CREATE
+              TABLE</literal> statement supports
+              <literal>AVG_ROW_LENGTH</literal> and
               <literal>MAX_ROWS</literal> options. See
               <xref linkend="create-table"/>. The server uses these
               options to determine how large a table to allow.

@@ -3171,8 +3172,8 @@
               You have found a bug in the data storage code. This isn't
               likely, but it's at least possible. In this case, you can
               try to change the storage engine to another engine by
-              using <literal role="stmt">ALTER TABLE</literal> on a repaired
copy of
-              the table.
+              using <literal role="stmt">ALTER TABLE</literal> on a
+              repaired copy of the table.
             </para>
           </listitem>
 

@@ -3386,9 +3387,10 @@
               <literal>BLOB</literal> or <literal>TEXT</literal>
               columns), you can try to change all
               <literal>VARCHAR</literal> to
<literal>CHAR</literal> with
-              <literal role="stmt">ALTER TABLE</literal>. This forces MySQL
to use
-              fixed-size rows. Fixed-size rows take a little extra
-              space, but are much more tolerant to corruption.
+              <literal role="stmt">ALTER TABLE</literal>. This forces
+              MySQL to use fixed-size rows. Fixed-size rows take a
+              little extra space, but are much more tolerant to
+              corruption.
             </para>
 
             <para>

@@ -3501,13 +3503,14 @@
           <literal>REPAIR TABLE</literal> or <literal>OPTIMIZE
           TABLE</literal> or when the indexes are created in a batch
           after <literal>LOAD DATA INFILE</literal> or after an
-          <literal role="stmt">ALTER TABLE</literal> statement. All of these
-          statements may create large temporary files that, if left to
-          themselves, would cause big problems for the rest of the
-          system. If the disk becomes full while MySQL is doing any of
-          these operations, it removes the big temporary files and mark
-          the table as crashed. The exception is that for <literal
role="stmt">ALTER
-          TABLE</literal>, the old table is left unchanged.
+          <literal role="stmt">ALTER TABLE</literal> statement. All of
+          these statements may create large temporary files that, if
+          left to themselves, would cause big problems for the rest of
+          the system. If the disk becomes full while MySQL is doing any
+          of these operations, it removes the big temporary files and
+          mark the table as crashed. The exception is that for
+          <literal role="stmt">ALTER TABLE</literal>, the old table is
+          left unchanged.
         </para>
 
         <formalpara role="mnmas">

@@ -3619,8 +3622,8 @@
         </para>
 
         <para>
-          <literal role="stmt">ALTER TABLE</literal> creates a temporary
table in
-          the same directory as the original table.
+          <literal role="stmt">ALTER TABLE</literal> creates a temporary
+          table in the same directory as the original table.
         </para>
 
       </section>

@@ -4947,19 +4950,19 @@
         </indexterm>
 
         <para>
-          <literal role="stmt">ALTER TABLE</literal> changes a table to the
current
-          character set. If you get a duplicate-key error during
-          <literal role="stmt">ALTER TABLE</literal>, the cause is either
that the
-          new character sets maps two keys to the same value or that the
-          table is corrupted. In the latter case, you should run
-          <literal>REPAIR TABLE</literal> on the table.
+          <literal role="stmt">ALTER TABLE</literal> changes a table to
+          the current character set. If you get a duplicate-key error
+          during <literal role="stmt">ALTER TABLE</literal>, the cause
+          is either that the new character sets maps two keys to the
+          same value or that the table is corrupted. In the latter case,
+          you should run <literal>REPAIR TABLE</literal> on the table.
         </para>
 
         <para>
-          If <literal role="stmt">ALTER TABLE</literal> dies with the
following
-          error, the problem may be that MySQL crashed during an earlier
-          <literal role="stmt">ALTER TABLE</literal> operation and there is
an old
-          table named
+          If <literal role="stmt">ALTER TABLE</literal> dies with the
+          following error, the problem may be that MySQL crashed during
+          an earlier <literal role="stmt">ALTER TABLE</literal>
+          operation and there is an old table named
           <filename>A-<replaceable>xxx</replaceable></filename>
or
           <filename>B-<replaceable>xxx</replaceable></filename>
lying
           around:

@@ -4978,7 +4981,8 @@
         </para>
 
         <para>
-          <literal role="stmt">ALTER TABLE</literal> works in the following
way:
+          <literal role="stmt">ALTER TABLE</literal> works in the
+          following way:
         </para>
 
         <itemizedlist>

@@ -5033,12 +5037,12 @@
         </para>
 
         <para>
-          If you use <literal role="stmt">ALTER TABLE</literal> on a
transactional
-          table or if you are using Windows or OS/2, <literal role="stmt">ALTER
-          TABLE</literal> unlocks the table if you had done a
-          <literal>LOCK TABLE</literal> on it. This is done because
-          <literal>InnoDB</literal> and these operating systems cannot
-          drop a table that is in use.
+          If you use <literal role="stmt">ALTER TABLE</literal> on a
+          transactional table or if you are using Windows or OS/2,
+          <literal role="stmt">ALTER TABLE</literal> unlocks the table
+          if you had done a <literal>LOCK TABLE</literal> on it. This is
+          done because <literal>InnoDB</literal> and these operating
+          systems cannot drop a table that is in use.
         </para>
 
       </section>

@@ -5277,10 +5281,10 @@
               Fixed in MySQL 4.0.12: You can get a deadlock (hung
               thread) if you use <literal>LOCK TABLE</literal> to lock
               multiple tables and then in the same connection use
-              <literal role="stmt">DROP TABLE</literal> to drop one of them
while
-              another thread is trying to lock it. (To break the
-              deadlock, you can use <literal>KILL</literal> to terminate
-              any of the threads involved.)
+              <literal role="stmt">DROP TABLE</literal> to drop one of
+              them while another thread is trying to lock it. (To break
+              the deadlock, you can use <literal>KILL</literal> to
+              terminate any of the threads involved.)
             </para>
           </listitem>
 

@@ -5355,9 +5359,9 @@
           <listitem>
             <para>
               <literal>FLUSH TABLES WITH READ LOCK</literal> does not
-              block <literal role="stmt">CREATE TABLE</literal>, which may
cause a
-              problem with the binary log position when doing a full
-              backup of tables and the binary log.
+              block <literal role="stmt">CREATE TABLE</literal>, which
+              may cause a problem with the binary log position when
+              doing a full backup of tables and the binary log.
             </para>
           </listitem>
 

@@ -5480,10 +5484,11 @@
               If one user has a long-running transaction and another
               user drops a table that is updated in the transaction,
               there is small chance that the binary log may contain the
-              <literal role="stmt">DROP TABLE</literal> command before the
table is
-              used in the transaction itself. We plan to fix this by
-              having the <literal role="stmt">DROP TABLE</literal> command
wait
-              until the table is not being used in any transaction.
+              <literal role="stmt">DROP TABLE</literal> command before
+              the table is used in the transaction itself. We plan to
+              fix this by having the <literal role="stmt">DROP
+              TABLE</literal> command wait until the table is not being
+              used in any transaction.
             </para>
           </listitem>
 

@@ -5522,8 +5527,8 @@
 
           <listitem>
             <para>
-              Don't execute <literal role="stmt">ALTER TABLE</literal> on a
-              <literal>BDB</literal> table on which you are running
+              Don't execute <literal role="stmt">ALTER TABLE</literal>
+              on a <literal>BDB</literal> table on which you are running
               multiple-statement transactions until all those
               transactions complete. (The transaction might be ignored.)
             </para>

@@ -5798,19 +5803,20 @@
           <listitem>
             <para>
               Numeric calculations are done with
-              <literal role="type">BIGINT</literal> or
<literal>DOUBLE</literal>
-              (both are normally 64 bits long). Which precision you get
-              depends on the function. The general rule is that bit
-              functions are performed with <literal
role="type">BIGINT</literal>
-              precision, <literal>IF</literal> and
+              <literal role="type">BIGINT</literal> or
+              <literal>DOUBLE</literal> (both are normally 64 bits
+              long). Which precision you get depends on the function.
+              The general rule is that bit functions are performed with
+              <literal role="type">BIGINT</literal> precision,
+              <literal>IF</literal> and
               <literal role="func">ELT()</literal> with
-              <literal role="type">BIGINT</literal> or
<literal>DOUBLE</literal>
-              precision, and the rest with <literal>DOUBLE</literal>
-              precision. You should try to avoid using unsigned long
-              long values if they resolve to be larger than 63 bits
-              (9223372036854775807) for anything other than bit fields.
-              MySQL Server 4.0 has better <literal
role="type">BIGINT</literal>
-              handling than 3.23.
+              <literal role="type">BIGINT</literal> or
+              <literal>DOUBLE</literal> precision, and the rest with
+              <literal>DOUBLE</literal> precision. You should try to
+              avoid using unsigned long long values if they resolve to
+              be larger than 63 bits (9223372036854775807) for anything
+              other than bit fields. MySQL Server 4.0 has better
+              <literal role="type">BIGINT</literal> handling than 3.23.
             </para>
           </listitem>
 

@@ -5945,8 +5951,8 @@
 
           <listitem>
             <para>
-              If you use <literal role="stmt">ALTER TABLE</literal> to add a
-              <literal>UNIQUE</literal> index to a table used in a
+              If you use <literal role="stmt">ALTER TABLE</literal> to
+              add a <literal>UNIQUE</literal> index to a table used in a
               <literal>MERGE</literal> table and then add a normal index
               on the <literal>MERGE</literal> table, the key order is
               different for the tables if there was an old,


Modified: trunk/refman-4.1/functions-core.xml
===================================================================
--- trunk/refman-4.1/functions-core.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/functions-core.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 21, Lines Added: 60, Lines Deleted: 47; 11278 bytes

@@ -1966,7 +1966,8 @@
         <para>
           As of MySQL 4.0.6, the type for the <literal>test</literal>
           column is <literal>CHAR(4)</literal>, whereas in earlier
-          versions the type would be <literal role="type">BIGINT</literal>.
+          versions the type would be
+          <literal role="type">BIGINT</literal>.
         </para>
       </listitem>
 

@@ -2130,7 +2131,8 @@
           Returns a string representation of the binary value of
           <replaceable>N</replaceable>, where
           <replaceable>N</replaceable> is a longlong
-          (<literal role="type">BIGINT</literal>) number. This is equivalent
to
+          (<literal role="type">BIGINT</literal>) number. This is
+          equivalent to
           <literal
role="func">CONV(<replaceable>N</replaceable>,10,2)</literal>.
           Returns <literal>NULL</literal> if
           <replaceable>N</replaceable> is
<literal>NULL</literal>.

@@ -2643,7 +2645,8 @@
           string representation of the hexadecimal value of
           <replaceable>N</replaceable>, where
           <replaceable>N</replaceable> is a longlong
-          (<literal role="type">BIGINT</literal>) number. This is equivalent
to
+          (<literal role="type">BIGINT</literal>) number. This is
+          equivalent to
           <literal
role="func">CONV(<replaceable>N</replaceable>,10,16)</literal>.
         </para>
 

@@ -5386,8 +5389,8 @@
             <literal role="op" condition="minus">-</literal>,
             <literal role="op" condition="plus">+</literal>, and
             <literal role="op" condition="times">*</literal>, the result
-            is calculated with <literal role="type">BIGINT</literal> (64-bit)
-            precision if both arguments are integers.
+            is calculated with <literal role="type">BIGINT</literal>
+            (64-bit) precision if both arguments are integers.
           </para>
         </listitem>
 

@@ -5552,11 +5555,12 @@
 
           <note>
             <para>
-              If this operator is used with a <literal
role="type">BIGINT</literal>,
-              the return value is also a <literal
role="type">BIGINT</literal>. This
-              means that you should avoid using
-              <literal>&minus;</literal> on integers that may have the
-              value of &minus;2<superscript>63</superscript>.
+              If this operator is used with a
+              <literal role="type">BIGINT</literal>, the return value is
+              also a <literal role="type">BIGINT</literal>. This means
+              that you should avoid using <literal>&minus;</literal> on
+              integers that may have the value of
+              &minus;2<superscript>63</superscript>.
             </para>
           </note>
         </listitem>

@@ -5602,8 +5606,8 @@
           <para>
             The result of the last expression is incorrect because the
             result of the integer multiplication exceeds the 64-bit
-            range of <literal role="type">BIGINT</literal> calculations. (See
-            <xref linkend="numeric-types"/>.)
+            range of <literal role="type">BIGINT</literal> calculations.
+            (See <xref linkend="numeric-types"/>.)
           </para>
         </listitem>
 

@@ -5651,9 +5655,10 @@
 </programlisting>
 
           <para>
-            A division is calculated with <literal
role="type">BIGINT</literal>
-            arithmetic only if performed in a context where its result
-            is converted to an integer.
+            A division is calculated with
+            <literal role="type">BIGINT</literal> arithmetic only if
+            performed in a context where its result is converted to an
+            integer.
           </para>
         </listitem>
 

@@ -5793,8 +5798,8 @@
 </programlisting>
 
           <para>
-            This function is safe to use with <literal
role="type">BIGINT</literal>
-            values.
+            This function is safe to use with
+            <literal role="type">BIGINT</literal> values.
           </para>
         </listitem>
 

@@ -6593,8 +6598,9 @@
 </programlisting>
 
           <para>
-            This function is safe to use with <literal
role="type">BIGINT</literal>
-            values. The <literal><replaceable>N</replaceable> MOD
+            This function is safe to use with
+            <literal role="type">BIGINT</literal> values. The
+            <literal><replaceable>N</replaceable> MOD
             <replaceable>M</replaceable></literal> syntax works only as
             of MySQL 4.1.0.
           </para>

@@ -6648,7 +6654,8 @@
             Returns a string representation of the octal value of
             <replaceable>N</replaceable>, where
             <replaceable>N</replaceable> is a longlong
-            (<literal role="type">BIGINT</literal>) number. This is
equivalent to
+            (<literal role="type">BIGINT</literal>) number. This is
+            equivalent to
             <literal
role="func">CONV(<replaceable>N</replaceable>,10,8)</literal>.
             Returns <literal>NULL</literal> if
             <replaceable>N</replaceable> is
<literal>NULL</literal>.

@@ -10630,9 +10637,10 @@
       <listitem>
         <para>
           A <literal>FULLTEXT</literal> index definition can be given in
-          the <literal role="stmt">CREATE TABLE</literal> statement when a
table is
-          created, or added later using <literal role="stmt">ALTER
TABLE</literal>
-          or <literal>CREATE INDEX</literal>.
+          the <literal role="stmt">CREATE TABLE</literal> statement when
+          a table is created, or added later using
+          <literal role="stmt">ALTER TABLE</literal> or <literal>CREATE
+          INDEX</literal>.
         </para>
       </listitem>
 

@@ -12624,9 +12632,9 @@
         An alternative to using <command>myisamchk</command> is to use
         the <literal>REPAIR TABLE</literal>, <literal>ANALYZE
         TABLE</literal>, <literal>OPTIMIZE TABLE</literal>, or
-        <literal role="stmt">ALTER TABLE</literal> statements. These
statements are
-        performed by the server, which knows the proper full-text
-        parameter values to use.
+        <literal role="stmt">ALTER TABLE</literal> statements. These
+        statements are performed by the server, which knows the proper
+        full-text parameter values to use.
       </para>
 
     </section>

@@ -13079,12 +13087,13 @@
 
     <para>
       The handing of unsigned values was changed in MySQL 4.0 to be able
-      to support <literal role="type">BIGINT</literal> values properly. If
you have
-      some code that you want to run in both MySQL 4.0 and 3.23, you
-      probably cannot use the <literal role="func">CAST()</literal>
-      function. You can use the following technique to get a signed
-      result when subtracting two unsigned integer columns
-      <literal>ucol1</literal> and <literal>ucol2</literal>:
+      to support <literal role="type">BIGINT</literal> values properly.
+      If you have some code that you want to run in both MySQL 4.0 and
+      3.23, you probably cannot use the
+      <literal role="func">CAST()</literal> function. You can use the
+      following technique to get a signed result when subtracting two
+      unsigned integer columns <literal>ucol1</literal> and
+      <literal>ucol2</literal>:
     </para>
 
 <programlisting>

@@ -13136,8 +13145,9 @@
       <remark role="help-category" condition="Bit Functions@Functions"/>
 
       <para>
-        MySQL uses <literal role="type">BIGINT</literal> (64-bit) arithmetic
for bit
-        operations, so these operators have a maximum range of 64 bits.
+        MySQL uses <literal role="type">BIGINT</literal> (64-bit)
+        arithmetic for bit operations, so these operators have a maximum
+        range of 64 bits.
       </para>
 
       <itemizedlist>

@@ -13288,8 +13298,8 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Shifts a longlong (<literal role="type">BIGINT</literal>) number
to the
-            left.
+            Shifts a longlong (<literal role="type">BIGINT</literal>)
+            number to the left.
           </para>
 
           <remark role="help-description-end"/>

@@ -13324,8 +13334,8 @@
           <remark role="help-description-begin"/>
 
           <para>
-            Shifts a longlong (<literal role="type">BIGINT</literal>) number
to the
-            right.
+            Shifts a longlong (<literal role="type">BIGINT</literal>)
+            number to the right.
           </para>
 
           <remark role="help-description-end"/>

@@ -15535,9 +15545,9 @@
               <literal role="func">INET_ATON()</literal>, it is
               recommended that you use an <literal>INT
               UNSIGNED</literal> column. If you use a (signed)
-              <literal role="type">INT</literal> column, values corresponding
to IP
-              addresses for which the first octet is greater than 127
-              cannot be stored correctly. See
+              <literal role="type">INT</literal> column, values
+              corresponding to IP addresses for which the first octet is
+              greater than 127 cannot be stored correctly. See
               <xref linkend="numeric-types"/>.
             </para>
           </note>

@@ -16049,7 +16059,8 @@
           <para>
             Returns the bitwise <literal>AND</literal> of all bits in
             <replaceable>expr</replaceable>. The calculation is
-            performed with 64-bit (<literal role="type">BIGINT</literal>)
precision.
+            performed with 64-bit
+            (<literal role="type">BIGINT</literal>) precision.
           </para>
 
           <remark role="help-description-end"/>

@@ -16058,9 +16069,9 @@
             As of MySQL 4.0.17, this function returns
             <literal>18446744073709551615</literal> if there were no
             matching rows. (This is the value of an unsigned
-            <literal role="type">BIGINT</literal> value with all bits set to
1.)
-            Before 4.0.17, the function returns <literal>-1</literal> if
-            there were no matching rows.
+            <literal role="type">BIGINT</literal> value with all bits
+            set to 1.) Before 4.0.17, the function returns
+            <literal>-1</literal> if there were no matching rows.
           </para>
         </listitem>
 

@@ -16084,7 +16095,8 @@
           <para>
             Returns the bitwise <literal>OR</literal> of all bits in
             <replaceable>expr</replaceable>. The calculation is
-            performed with 64-bit (<literal role="type">BIGINT</literal>)
precision.
+            performed with 64-bit
+            (<literal role="type">BIGINT</literal>) precision.
           </para>
 
           <remark role="help-description-end"/>

@@ -16115,7 +16127,8 @@
           <para>
             Returns the bitwise <literal role="op">XOR</literal> of all
             bits in <replaceable>expr</replaceable>. The calculation is
-            performed with 64-bit (<literal role="type">BIGINT</literal>)
precision.
+            performed with 64-bit
+            (<literal role="type">BIGINT</literal>) precision.
           </para>
 
           <remark role="help-description-end"/>


Modified: trunk/refman-4.1/installing.xml
===================================================================
--- trunk/refman-4.1/installing.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/installing.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 7, Lines Added: 30, Lines Deleted: 29; 5525 bytes

@@ -5643,12 +5643,12 @@
           </para>
 
           <para>
-            While you are executing an <literal role="stmt">ALTER
TABLE</literal>
-            statement, the table is locked from being used by other
-            threads. This has to do with the fact that on Windows, you
-            cannot delete a file that is in use by another thread. In
-            the future, we may find some way to work around this
-            problem.
+            While you are executing an <literal role="stmt">ALTER
+            TABLE</literal> statement, the table is locked from being
+            used by other threads. This has to do with the fact that on
+            Windows, you cannot delete a file that is in use by another
+            thread. In the future, we may find some way to work around
+            this problem.
           </para>
         </listitem>
 

@@ -5659,13 +5659,13 @@
           </para>
 
           <para>
-            <literal role="stmt">DROP TABLE</literal> on a table that is in
use by a
-            <literal>MERGE</literal> table does not work on Windows
-            because the <literal>MERGE</literal> handler does the table
-            mapping hidden from the upper layer of MySQL. Because
-            Windows does not allow you to drop files that are open, you
-            first must flush all <literal>MERGE</literal> tables (with
-            <literal>FLUSH TABLES</literal>) or drop the
+            <literal role="stmt">DROP TABLE</literal> on a table that is
+            in use by a <literal>MERGE</literal> table does not work on
+            Windows because the <literal>MERGE</literal> handler does
+            the table mapping hidden from the upper layer of MySQL.
+            Because Windows does not allow you to drop files that are
+            open, you first must flush all <literal>MERGE</literal>
+            tables (with <literal>FLUSH TABLES</literal>) or drop the
             <literal>MERGE</literal> table before dropping the table. We
             will fix this at the same time we introduce views.
           </para>

@@ -12838,10 +12838,11 @@
                 <literal>BINARY</literal> (in the case of 4.1.0 and
                 4.1.1, with any character set and collation), and that
                 column may contain characters with a code &lt;
-                ASCII(32), you should do <literal role="stmt">ALTER
TABLE</literal>
-                or <literal>OPTIMIZE TABLE</literal> on it to regenerate
-                the index, after upgrading to MySQL 4.1.3 or later. You
-                can also rebuild the table from a dump.
+                ASCII(32), you should do <literal role="stmt">ALTER
+                TABLE</literal> or <literal>OPTIMIZE TABLE</literal> on
+                it to regenerate the index, after upgrading to MySQL
+                4.1.3 or later. You can also rebuild the table from a
+                dump.
               </para>
 
               <para>

@@ -12899,11 +12900,11 @@
                 checksum algorithm in MySQL 4.1. If you have
                 <literal>MyISAM</literal> tables with live checksum
                 enabled (you used <literal>CHECKSUM=1</literal> in
-                <literal role="stmt">CREATE TABLE</literal> or <literal
role="stmt">ALTER
-                TABLE</literal>), these tables appear to be corrupted
-                following an upgrade. Use <literal>REPAIR
-                TABLE</literal> to recalculate the checksum for each
-                such table.
+                <literal role="stmt">CREATE TABLE</literal> or
+                <literal role="stmt">ALTER TABLE</literal>), these
+                tables appear to be corrupted following an upgrade. Use
+                <literal>REPAIR TABLE</literal> to recalculate the
+                checksum for each such table.
               </para>
             </listitem>
 

@@ -12939,8 +12940,8 @@
             definition, MySQL displays <literal>CHAR(2)</literal>. You
             can retrieve existing data from the table, but you can only
             store new values containing up to two characters. To correct
-            this issue, use <literal role="stmt">ALTER TABLE</literal> to
change the
-            column definition. For example:
+            this issue, use <literal role="stmt">ALTER TABLE</literal>
+            to change the column definition. For example:
           </para>
 
 <programlisting>

@@ -13656,8 +13657,8 @@
           <para>
             Individual tables can be changed to
             <literal>MyISAM</literal> by using the following
-            <literal role="stmt">ALTER TABLE</literal> statement for each
table to
-            be converted:
+            <literal role="stmt">ALTER TABLE</literal> statement for
+            each table to be converted:
           </para>
 
 <programlisting>

@@ -14044,9 +14045,9 @@
         <listitem>
           <para>
             You should use integers to store values in
-            <literal role="type">BIGINT</literal> columns (instead of using
strings
-            as in MySQL 3.23). Using strings still works, but using
-            integers is more efficient.
+            <literal role="type">BIGINT</literal> columns (instead of
+            using strings as in MySQL 3.23). Using strings still works,
+            but using integers is more efficient.
           </para>
         </listitem>
 


Modified: trunk/refman-4.1/internationalization.xml
===================================================================
--- trunk/refman-4.1/internationalization.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/internationalization.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 6, Lines Added: 24, Lines Deleted: 23; 4502 bytes

@@ -671,8 +671,8 @@
         <para>
           The database character set and collation are used as default
           values if the table character set and collation are not
-          specified in <literal role="stmt">CREATE TABLE</literal>
statements. They
-          have no other purpose.
+          specified in <literal role="stmt">CREATE TABLE</literal>
+          statements. They have no other purpose.
         </para>
 
         <para>

@@ -695,9 +695,10 @@
 
         <para>
           Every table has a table character set and a table collation.
-          The <literal role="stmt">CREATE TABLE</literal> and <literal
role="stmt">ALTER
-          TABLE</literal> statements have optional clauses for
-          specifying the table character set and collation:
+          The <literal role="stmt">CREATE TABLE</literal> and
+          <literal role="stmt">ALTER TABLE</literal> statements have
+          optional clauses for specifying the table character set and
+          collation:
         </para>
 
 <programlisting>

@@ -779,10 +780,10 @@
           Every <quote>character</quote> column (that is, a column of
           type <literal>CHAR</literal>,
<literal>VARCHAR</literal>, or
           <literal>TEXT</literal>) has a column character set and a
-          column collation. Column definition syntax for <literal
role="stmt">CREATE
-          TABLE</literal> and <literal role="stmt">ALTER
TABLE</literal> has
-          optional clauses for specifying the column character set and
-          collation:
+          column collation. Column definition syntax for
+          <literal role="stmt">CREATE TABLE</literal> and
+          <literal role="stmt">ALTER TABLE</literal> has optional
+          clauses for specifying the column character set and collation:
         </para>
 
 <programlisting>

@@ -806,9 +807,9 @@
 
         <para>
           If you convert a column from one character set to another,
-          <literal role="stmt">ALTER TABLE</literal> attempts to map the data
-          values, but if the character sets are incompatible, there may
-          be data loss.
+          <literal role="stmt">ALTER TABLE</literal> attempts to map the
+          data values, but if the character sets are incompatible, there
+          may be data loss.
         </para>
 
         <para>

@@ -2996,10 +2997,10 @@
 
         <para>
           <literal>SHOW CREATE TABLE</literal> is similar, but displays
-          the <literal role="stmt">CREATE TABLE</literal> statement to create
a
-          given table. The column definitions indicate any character set
-          specifications, and the table options include character set
-          information.
+          the <literal role="stmt">CREATE TABLE</literal> statement to
+          create a given table. The column definitions indicate any
+          character set specifications, and the table options include
+          character set information.
         </para>
 
         <para>

@@ -3744,19 +3745,19 @@
         <para>
           If you can ensure that the tables will not otherwise be
           modified before you perform the character set conversion, you
-          can issue all of the <literal role="stmt">ALTER TABLE</literal>
statements
-          after upgrading to MySQL 4.1.
+          can issue all of the <literal role="stmt">ALTER
+          TABLE</literal> statements after upgrading to MySQL 4.1.
         </para>
 
         <para>
           If you specified attributes when creating a column initially,
           you should also specify them when altering the table with
-          <literal role="stmt">ALTER TABLE</literal>. For example, if you
specified
-          <literal>NOT NULL</literal> and an explicit
+          <literal role="stmt">ALTER TABLE</literal>. For example, if
+          you specified <literal>NOT NULL</literal> and an explicit
           <literal>DEFAULT</literal> value, you should also provide them
-          in the <literal role="stmt">ALTER TABLE</literal> statement.
Otherwise,
-          the resulting column definition will not include those
-          attributes.
+          in the <literal role="stmt">ALTER TABLE</literal> statement.
+          Otherwise, the resulting column definition will not include
+          those attributes.
         </para>
 
       </section>


Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/introduction.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 2, Lines Added: 10, Lines Deleted: 8; 1758 bytes

@@ -1546,12 +1546,13 @@
                 <literal>DROP
                 <replaceable>col_name</replaceable></literal>, or
                 <literal>DROP INDEX</literal>,
<literal>IGNORE</literal>
-                or <literal>RENAME</literal> in <literal
role="stmt">ALTER
-                TABLE</literal> statements. Use of multiple
-                <literal>ADD</literal>, <literal>ALTER</literal>,
-                <literal>DROP</literal>, or
<literal>CHANGE</literal>
-                clauses in an <literal role="stmt">ALTER TABLE</literal>
-                statement. See <xref linkend="alter-table"/>.
+                or <literal>RENAME</literal> in
+                <literal role="stmt">ALTER TABLE</literal> statements.
+                Use of multiple <literal>ADD</literal>,
+                <literal>ALTER</literal>,
<literal>DROP</literal>, or
+                <literal>CHANGE</literal> clauses in an
+                <literal role="stmt">ALTER TABLE</literal> statement.
+                See <xref linkend="alter-table"/>.
               </para>
             </listitem>
 

@@ -1575,8 +1576,9 @@
 
             <listitem>
               <para>
-                Use of <literal>IF EXISTS</literal> with <literal
role="stmt">DROP
-                TABLE</literal> and <literal>DROP DATABASE</literal>.
+                Use of <literal>IF EXISTS</literal> with
+                <literal role="stmt">DROP TABLE</literal> and
+                <literal>DROP DATABASE</literal>.
               </para>
             </listitem>
 


Modified: trunk/refman-4.1/language-structure.xml
===================================================================
--- trunk/refman-4.1/language-structure.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/language-structure.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 3, Lines Added: 15, Lines Deleted: 15; 3076 bytes

@@ -1281,10 +1281,10 @@
             <row>
               <entry><literal>0</literal></entry>
               <entry>Table and database names are stored on disk using the
lettercase
-                specified in the <literal role="stmt">CREATE TABLE</literal>
or
-                <literal>CREATE DATABASE</literal> statement. Name
-                comparisons are case sensitive. Note that if you force
-                this variable to 0 with
+                specified in the <literal role="stmt">CREATE
+                TABLE</literal> or <literal>CREATE DATABASE</literal>
+                statement. Name comparisons are case sensitive. Note
+                that if you force this variable to 0 with
                 <option>--lower-case-table-names=0</option> on a
                 case-insensitive filesystem and access
                 <literal>MyISAM</literal> tablenames using different

@@ -1301,13 +1301,13 @@
             <row>
               <entry><literal>2</literal></entry>
               <entry>Table and database names are stored on disk using the
lettercase
-                specified in the <literal role="stmt">CREATE TABLE</literal>
or
-                <literal>CREATE DATABASE</literal> statement, but MySQL
-                converts them to lowercase on lookup. Name comparisons
-                are not case sensitive. This works
-                <emphasis>only</emphasis> on filesystems that are not
-                case sensitive! <literal>InnoDB</literal> table names
-                are stored in lowercase, as for
+                specified in the <literal role="stmt">CREATE
+                TABLE</literal> or <literal>CREATE DATABASE</literal>
+                statement, but MySQL converts them to lowercase on
+                lookup. Name comparisons are not case sensitive. This
+                works <emphasis>only</emphasis> on filesystems that are
+                not case sensitive! <literal>InnoDB</literal> table
+                names are stored in lowercase, as for
                 <literal>lower_case_table_names=1</literal>. Setting
                 <literal>lower_case_table_names</literal> to
                 <literal>2</literal> can be done as of MySQL
4.0.18.</entry>

@@ -1681,10 +1681,10 @@
 
     <para>
       Certain words such as <literal>SELECT</literal>,
-      <literal>DELETE</literal>, or <literal
role="type">BIGINT</literal> are
-      reserved and require special treatment for use as identifiers such
-      as table and column names. This may also be true for the names of
-      built-in functions.
+      <literal>DELETE</literal>, or
+      <literal role="type">BIGINT</literal> are reserved and require
+      special treatment for use as identifiers such as table and column
+      names. This may also be true for the names of built-in functions.
     </para>
 
     <para>


Modified: trunk/refman-4.1/mysql-cluster-configuration.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-configuration.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/mysql-cluster-configuration.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 2, Lines Added: 13, Lines Deleted: 12; 2544 bytes

@@ -517,10 +517,11 @@
           <literal>ndb-connectstring</literal> parameters in the
           <literal>[mysqld]</literal> in the
<filename>my.cnf</filename>
           file as shown previously, you cannot execute any
-          <literal role="stmt">CREATE TABLE</literal> or <literal
role="stmt">ALTER
-          TABLE</literal> statements without having actually started the
-          cluster. Otherwise, these statements will fail with an error.
-          <emphasis>This is by design</emphasis>.
+          <literal role="stmt">CREATE TABLE</literal> or
+          <literal role="stmt">ALTER TABLE</literal> statements without
+          having actually started the cluster. Otherwise, these
+          statements will fail with an error. <emphasis>This is by
+          design</emphasis>.
         </para>
       </important>
 

@@ -2475,14 +2476,14 @@
 
           <para>
             When setting <literal>MaxNoOfAttributes</literal>, it is
-            important to prepare in advance for any <literal role="stmt">ALTER
-            TABLE</literal> statements that you might want to perform in
-            the future. This is due to the fact, during the execution of
-            <literal role="stmt">ALTER TABLE</literal> on a Cluster table, 3
times
-            the number of attributes as in the original table are used,
-            and a good practice is to allow double this amount. For
-            example, if the MySQL Cluster table having the greatest
-            number of attributes
+            important to prepare in advance for any
+            <literal role="stmt">ALTER TABLE</literal> statements that
+            you might want to perform in the future. This is due to the
+            fact, during the execution of <literal role="stmt">ALTER
+            TABLE</literal> on a Cluster table, 3 times the number of
+            attributes as in the original table are used, and a good
+            practice is to allow double this amount. For example, if the
+            MySQL Cluster table having the greatest number of attributes
             (<replaceable>greatest_number_of_attributes</replaceable>)
             has 100 attributes, a good starting point for the value of
             <literal>MaxNoOfAttributes</literal> would be <literal>6 *


Modified: trunk/refman-4.1/mysql-cluster-faq.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-faq.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/mysql-cluster-faq.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 2, Lines Added: 7, Lines Deleted: 7; 1642 bytes

@@ -1241,8 +1241,8 @@
               The <literal>NDB</literal> engine does not support foreign
               key constraints. As with <literal>MyISAM</literal> tables,
               if these are specified in a <literal role="stmt">CREATE
-              TABLE</literal> or <literal role="stmt">ALTER
TABLE</literal>
-              statement, they are ignored.
+              TABLE</literal> or <literal role="stmt">ALTER
+              TABLE</literal> statement, they are ignored.
             </para>
           </listitem>
 

@@ -1289,11 +1289,11 @@
         <para>
           It is also possible to convert existing tables using other
           storage engines to <literal>NDBCLUSTER</literal> using one or
-          more <literal role="stmt">ALTER TABLE</literal> statement. However,
the
-          definition of the table must be compatible with the
-          <literal>NDBCLUSTER</literal> storage engine prior to making
-          the conversion. In MySQL &current-series;, an additional
-          workaround is also required.
+          more <literal role="stmt">ALTER TABLE</literal> statement.
+          However, the definition of the table must be compatible with
+          the <literal>NDBCLUSTER</literal> storage engine prior to
+          making the conversion. In MySQL &current-series;, an
+          additional workaround is also required.
         </para>
 
         <para>


Modified: trunk/refman-4.1/mysql-cluster-limitations.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-limitations.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/mysql-cluster-limitations.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 5, Lines Added: 24, Lines Deleted: 23; 4613 bytes

@@ -418,10 +418,11 @@
                           <note>
                             <para>
                               Bulk loading, <literal>TRUNCATE
-                              TABLE</literal>, and <literal role="stmt">ALTER
-                              TABLE</literal> are handled as special
-                              cases by running multiple transactions,
-                              and so are not subject to this limitation.
+                              TABLE</literal>, and
+                              <literal role="stmt">ALTER TABLE</literal>
+                              are handled as special cases by running
+                              multiple transactions, and so are not
+                              subject to this limitation.
                             </para>
                           </note>
                         </listitem>

@@ -686,10 +687,10 @@
 
                     <para>
                       When copying an <literal>NDB</literal> table as
-                      part of an <literal role="stmt">ALTER TABLE</literal>,
the
-                      creation of the copy is non-transactional. (In any
-                      case, this operation is rolled back when the copy
-                      is deleted.)
+                      part of an <literal role="stmt">ALTER
+                      TABLE</literal>, the creation of the copy is
+                      non-transactional. (In any case, this operation is
+                      rolled back when the copy is deleted.)
                     </para>
 
                   </formalpara>

@@ -1149,13 +1150,13 @@
 
             <para>
               It is not possible to make online schema changes such as
-              those accomplished using <literal role="stmt">ALTER
TABLE</literal> or
-              <literal>CREATE INDEX</literal>, as the <literal>NDB
-              Cluster</literal> engine does not support autodiscovery of
-              such changes. (However, you can import or create a table
-              that uses a different storage engine, and then convert it
-              to <literal>NDB</literal> using <literal>ALTER TABLE
-              <replaceable>tbl_name</replaceable>
+              those accomplished using <literal role="stmt">ALTER
+              TABLE</literal> or <literal>CREATE INDEX</literal>, as
the
+              <literal>NDB Cluster</literal> engine does not support
+              autodiscovery of such changes. (However, you can import or
+              create a table that uses a different storage engine, and
+              then convert it to <literal>NDB</literal> using
+              <literal>ALTER TABLE <replaceable>tbl_name</replaceable>
               ENGINE=NDBCLUSTER</literal>. In such a case, you must
               issue a <literal>FLUSH TABLES</literal> statement to force
               the cluster to pick up the change.)

@@ -1303,10 +1304,10 @@
               <title><literal role="stmt">ALTER TABLE</literal>
operations</title>
 
               <para>
-                <literal role="stmt">ALTER TABLE</literal> is not fully
locking when
-                running multiple MySQL servers (SQL nodes). (As
-                discussed in the previous item, MySQL Cluster does not
-                support distributed table locks.)
+                <literal role="stmt">ALTER TABLE</literal> is not fully
+                locking when running multiple MySQL servers (SQL nodes).
+                (As discussed in the previous item, MySQL Cluster does
+                not support distributed table locks.)
               </para>
 
             </formalpara>

@@ -1362,10 +1363,10 @@
               <para>
                 DDL operations are not node failure safe. If a node
                 fails while trying to perform one of these (such as
-                <literal role="stmt">CREATE TABLE</literal> or <literal
role="stmt">ALTER
-                TABLE</literal>), the data dictionary is locked and no
-                further DDL statements can be executed without
-                restarting the cluster.
+                <literal role="stmt">CREATE TABLE</literal> or
+                <literal role="stmt">ALTER TABLE</literal>), the data
+                dictionary is locked and no further DDL statements can
+                be executed without restarting the cluster.
               </para>
 
             </formalpara>


Modified: trunk/refman-4.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-multi-computer.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/mysql-cluster-multi-computer.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 3, Lines Added: 10, Lines Deleted: 10; 2197 bytes

@@ -990,11 +990,11 @@
         the <literal>ndbcluster</literal> and
         <literal>ndb-connectstring</literal> parameters in the
         <literal>[mysqld]</literal> in the
<filename>my.cnf</filename>
-        file as shown previously, you cannot execute any <literal
role="stmt">CREATE
-        TABLE</literal> or <literal role="stmt">ALTER TABLE</literal>
statements
-        without having actually started the cluster. Otherwise, these
-        statements will fail with an error. <emphasis>This is by
-        design</emphasis>.
+        file as shown previously, you cannot execute any
+        <literal role="stmt">CREATE TABLE</literal> or
+        <literal role="stmt">ALTER TABLE</literal> statements without
+        having actually started the cluster. Otherwise, these statements
+        will fail with an error. <emphasis>This is by design</emphasis>.
       </para>
     </important>
 

@@ -1264,8 +1264,8 @@
 
         <para>
           Alternatively, for an existing table that uses a different
-          storage engine, use <literal role="stmt">ALTER TABLE</literal> to
change
-          the table to use <literal>NDBCLUSTER</literal>:
+          storage engine, use <literal role="stmt">ALTER TABLE</literal>
+          to change the table to use <literal>NDBCLUSTER</literal>:
         </para>
 
 <programlisting>

@@ -1368,9 +1368,9 @@
      
<literal>ENGINE=<replaceable>engine_name</replaceable></literal>
       with <literal>ENGINE=NDBCLUSTER</literal>. If you do not want to
       modify the file, you can use the unmodified file to create the
-      tables, and then use <literal role="stmt">ALTER TABLE</literal> to
change
-      their storage engine. The particulars are given later in this
-      section.
+      tables, and then use <literal role="stmt">ALTER TABLE</literal> to
+      change their storage engine. The particulars are given later in
+      this section.
     </para>
 
     <para>


Modified: trunk/refman-4.1/news-3.20.xml
===================================================================
--- trunk/refman-4.1/news-3.20.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/news-3.20.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 7, Lines Added: 19, Lines Deleted: 17; 3390 bytes

@@ -600,8 +600,8 @@
 
       <listitem>
         <para>
-          Fixed bug in <literal role="stmt">ALTER TABLE</literal> when
changing a
-          <literal>NOT NULL</literal> field to allow
+          Fixed bug in <literal role="stmt">ALTER TABLE</literal> when
+          changing a <literal>NOT NULL</literal> field to allow
           <literal>NULL</literal> values.
         </para>
       </listitem>

@@ -609,10 +609,10 @@
       <listitem>
         <para>
           Added some standard SQL synonyms as field types to
-          <literal role="stmt">CREATE TABLE</literal>. <literal
role="stmt">CREATE
-          TABLE</literal> now allows <literal>FLOAT(4)</literal> and
-          <literal>FLOAT(8)</literal> to mean
<literal>FLOAT</literal>
-          and <literal>DOUBLE</literal>.
+          <literal role="stmt">CREATE TABLE</literal>.
+          <literal role="stmt">CREATE TABLE</literal> now allows
+          <literal>FLOAT(4)</literal> and
<literal>FLOAT(8)</literal> to
+          mean <literal>FLOAT</literal> and
<literal>DOUBLE</literal>.
         </para>
       </listitem>
 

@@ -659,8 +659,8 @@
 
       <listitem>
         <para>
-          Extended <literal role="stmt">ALTER TABLE</literal> for standard
SQL
-          compliance.
+          Extended <literal role="stmt">ALTER TABLE</literal> for
+          standard SQL compliance.
         </para>
       </listitem>
 

@@ -738,7 +738,8 @@
 
       <listitem>
         <para>
-          <literal role="stmt">DROP TABLE</literal> now can take a list of
tables.
+          <literal role="stmt">DROP TABLE</literal> now can take a list
+          of tables.
         </para>
       </listitem>
 

@@ -787,8 +788,8 @@
 
       <listitem>
         <para>
-          <literal role="stmt">ALTER TABLE</literal> didn't copy null bit. As
a
-          result, fields that were allowed to have
+          <literal role="stmt">ALTER TABLE</literal> didn't copy null
+          bit. As a result, fields that were allowed to have
           <literal>NULL</literal> values were always
           <literal>NULL</literal>.
         </para>

@@ -843,9 +844,9 @@
 
       <listitem>
         <para>
-          New commands: <literal role="stmt">ALTER TABLE</literal>,
<literal>SELECT
-          ... INTO OUTFILE</literal> and <literal>LOAD DATA
-          INFILE</literal>.
+          New commands: <literal role="stmt">ALTER TABLE</literal>,
+          <literal>SELECT ... INTO OUTFILE</literal> and <literal>LOAD
+          DATA INFILE</literal>.
         </para>
       </listitem>
 

@@ -1342,9 +1343,10 @@
           <literal>SHOW FIELDS FROM
           <replaceable>tbl_name</replaceable></literal> is changed so
           the <literal>Type</literal> column contains information
-          suitable for <literal role="stmt">CREATE TABLE</literal>. In
previous
-          releases, some <literal role="stmt">CREATE TABLE</literal>
information had
-          to be patched when re-creating tables.
+          suitable for <literal role="stmt">CREATE TABLE</literal>. In
+          previous releases, some <literal role="stmt">CREATE
+          TABLE</literal> information had to be patched when re-creating
+          tables.
         </para>
       </listitem>
 


Modified: trunk/refman-4.1/news-3.21.xml
===================================================================
--- trunk/refman-4.1/news-3.21.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/news-3.21.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 6, Lines Added: 15, Lines Deleted: 14; 2753 bytes

@@ -227,8 +227,8 @@
 
       <listitem>
         <para>
-          <literal role="stmt">ALTER TABLE</literal> wrote two entries to the
update
-          log.
+          <literal role="stmt">ALTER TABLE</literal> wrote two entries
+          to the update log.
         </para>
       </listitem>
 

@@ -763,9 +763,9 @@
 
       <listitem>
         <para>
-          Changed <literal role="stmt">ALTER TABLE</literal> to work with
Windows
-          (Windows can't rename open files). Also fixed a couple of
-          small bugs in the Windows version.
+          Changed <literal role="stmt">ALTER TABLE</literal> to work
+          with Windows (Windows can't rename open files). Also fixed a
+          couple of small bugs in the Windows version.
         </para>
       </listitem>
 

@@ -1378,9 +1378,9 @@
 
       <listitem>
         <para>
-          Added <literal>RENAME</literal> option to <literal
role="stmt">ALTER
-          TABLE</literal>: <literal>ALTER TABLE name RENAME TO
-          new_name</literal>.
+          Added <literal>RENAME</literal> option to
+          <literal role="stmt">ALTER TABLE</literal>: <literal>ALTER
+          TABLE name RENAME TO new_name</literal>.
         </para>
       </listitem>
 

@@ -1507,7 +1507,8 @@
         <para>
           Fixed sorting problem on functions returning a
           <literal>FLOAT</literal>. Previously, the values were
-          converted to <literal role="type">INT</literal> values before
sorting.
+          converted to <literal role="type">INT</literal> values before
+          sorting.
         </para>
       </listitem>
 

@@ -1942,9 +1943,9 @@
           All old <literal>BLOB</literal> fields are now
           <literal>TEXT</literal> fields. This only changes that all
           searching on strings is done in case-sensitive fashion. You
-          must do an <literal role="stmt">ALTER TABLE</literal> and change
the data
-          type to <literal>BLOB</literal> if you want to have tests done
-          in case-sensitive fashion.
+          must do an <literal role="stmt">ALTER TABLE</literal> and
+          change the data type to <literal>BLOB</literal> if you want to
+          have tests done in case-sensitive fashion.
         </para>
       </listitem>
 

@@ -2553,8 +2554,8 @@
 
       <listitem>
         <para>
-          <literal role="stmt">ALTER TABLE</literal> now returns warnings
from field
-          conversions.
+          <literal role="stmt">ALTER TABLE</literal> now returns
+          warnings from field conversions.
         </para>
       </listitem>
 


Modified: trunk/refman-4.1/news-3.22.xml
===================================================================
--- trunk/refman-4.1/news-3.22.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/news-3.22.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 11, Lines Added: 29, Lines Deleted: 26; 5654 bytes

@@ -885,8 +885,8 @@
 
       <listitem>
         <para>
-          Added the <literal>MODIFY</literal> keyword to <literal
role="stmt">ALTER
-          TABLE</literal>.
+          Added the <literal>MODIFY</literal> keyword to
+          <literal role="stmt">ALTER TABLE</literal>.
         </para>
       </listitem>
 

@@ -1169,7 +1169,8 @@
       <listitem>
         <para>
           Fixed a bug in <filename>sql_list.h</filename> that made
-          <literal role="stmt">ALTER TABLE</literal> dump core in some
contexts.
+          <literal role="stmt">ALTER TABLE</literal> dump core in some
+          contexts.
         </para>
       </listitem>
 

@@ -1359,8 +1360,8 @@
 
       <listitem>
         <para>
-          Fixed a bug in <literal role="stmt">ALTER TABLE</literal> that
caused
-          <command>mysqld</command> to crash.
+          Fixed a bug in <literal role="stmt">ALTER TABLE</literal> that
+          caused <command>mysqld</command> to crash.
         </para>
       </listitem>
 

@@ -1515,8 +1516,8 @@
       <listitem>
         <para>
           Fixed conversion problem when using <literal role="stmt">ALTER
-          TABLE</literal> from a <literal role="type">INT</literal> to
a short
-          <literal role="func">CHAR()</literal> column.
+          TABLE</literal> from a <literal role="type">INT</literal> to
a
+          short <literal role="func">CHAR()</literal> column.
         </para>
       </listitem>
 

@@ -1634,9 +1635,9 @@
 
       <listitem>
         <para>
-          Fixed a problem with <literal role="stmt">DROP TABLE</literal> and
-          <command>mysqladmin shutdown</command> on Windows (a fatal bug
-          from 3.22.6).
+          Fixed a problem with <literal role="stmt">DROP TABLE</literal>
+          and <command>mysqladmin shutdown</command> on Windows (a fatal
+          bug from 3.22.6).
         </para>
       </listitem>
 

@@ -1699,8 +1700,8 @@
           <literal>OPTIMIZE TABLE
           <replaceable>tbl_name</replaceable></literal> can now be used
           to reclaim disk space after many deletes. Currently, this uses
-          <literal role="stmt">ALTER TABLE</literal> to regenerate the table,
but in
-          the future it will use an integrated
+          <literal role="stmt">ALTER TABLE</literal> to regenerate the
+          table, but in the future it will use an integrated
           <command>isamchk</command> for more speed.
         </para>
       </listitem>

@@ -1836,11 +1837,11 @@
       <listitem>
         <para>
           All table lock handing is changed to avoid some very subtle
-          deadlocks when using <literal role="stmt">DROP TABLE</literal>,
-          <literal role="stmt">ALTER TABLE</literal>, <literal>DELETE
FROM
-          TABLE</literal> and <command>mysqladmin
flush-tables</command>
-          under heavy usage. Changed locking code to get better handling
-          of locks of different types.
+          deadlocks when using <literal role="stmt">DROP
+          TABLE</literal>, <literal role="stmt">ALTER TABLE</literal>,
+          <literal>DELETE FROM TABLE</literal> and <command>mysqladmin
+          flush-tables</command> under heavy usage. Changed locking code
+          to get better handling of locks of different types.
         </para>
       </listitem>
 

@@ -1865,9 +1866,9 @@
           All count structures in the client
           (<literal>affected_rows()</literal>,
           <literal>insert_id()</literal>, ...) are now of type
-          <literal role="type">BIGINT</literal> to allow 64-bit values to be
used.
-          This required a minor change in the MySQL protocol which
-          should affect only old clients when using tables with
+          <literal role="type">BIGINT</literal> to allow 64-bit values
+          to be used. This required a minor change in the MySQL protocol
+          which should affect only old clients when using tables with
           <literal>AUTO_INCREMENT</literal> values &gt; 16MB.
         </para>
       </listitem>

@@ -2048,8 +2049,9 @@
           use these instead of the <literal role="func">MAX()</literal>
           and <literal role="func">MIN()</literal> functions to get the
           largest/smallest value from a list of values. These can now
-          handle <literal>REAL</literal>, <literal
role="type">BIGINT</literal> and
-          string (<literal>CHAR</literal> or
<literal>VARCHAR</literal>)
+          handle <literal>REAL</literal>,
+          <literal role="type">BIGINT</literal> and string
+          (<literal>CHAR</literal> or <literal>VARCHAR</literal>)
           values.
         </para>
       </listitem>

@@ -2143,8 +2145,8 @@
 
       <listitem>
         <para>
-          <literal role="stmt">DROP TABLE</literal> now waits for all users
to free
-          a table before deleting it.
+          <literal role="stmt">DROP TABLE</literal> now waits for all
+          users to free a table before deleting it.
         </para>
       </listitem>
 

@@ -2657,8 +2659,9 @@
       <listitem>
         <para>
           <literal>CREATE INDEX</literal> and <literal>DROP
-          INDEX</literal> are now implemented through <literal
role="stmt">ALTER
-          TABLE</literal>. <literal role="stmt">CREATE TABLE</literal>
is still the
+          INDEX</literal> are now implemented through
+          <literal role="stmt">ALTER TABLE</literal>.
+          <literal role="stmt">CREATE TABLE</literal> is still the
           recommended (fast) way to create indexes.
         </para>
       </listitem>


Modified: trunk/refman-4.1/news-3.23.xml
===================================================================
--- trunk/refman-4.1/news-3.23.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/news-3.23.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 20, Lines Added: 54, Lines Deleted: 48; 9077 bytes

@@ -545,9 +545,9 @@
         <para>
           Fixed unlikely deadlock bug when one thread did a
           <literal>LOCK TABLE</literal> and another thread did a
-          <literal role="stmt">DROP TABLE</literal>. In this case one could
do a
-          <literal>KILL</literal> on one of the threads to resolve the
-          deadlock.
+          <literal role="stmt">DROP TABLE</literal>. In this case one
+          could do a <literal>KILL</literal> on one of the threads to
+          resolve the deadlock.
         </para>
       </listitem>
 

@@ -646,8 +646,8 @@
           (default on Windows) and you had tables or databases with
           mixed case on disk, then executing <literal>SHOW TABLE
           STATUS</literal> followed with <literal>DROP
-          DATABASE</literal> or <literal role="stmt">DROP
TABLE</literal> could fail
-          with <literal>Errcode 13</literal>.
+          DATABASE</literal> or <literal role="stmt">DROP
+          TABLE</literal> could fail with <literal>Errcode
13</literal>.
         </para>
       </listitem>
 

@@ -902,8 +902,8 @@
 
       <listitem>
         <para>
-          Fixed a problem with <literal>BDB</literal> and <literal
role="stmt">ALTER
-          TABLE</literal>.
+          Fixed a problem with <literal>BDB</literal> and
+          <literal role="stmt">ALTER TABLE</literal>.
         </para>
       </listitem>
 

@@ -1074,9 +1074,9 @@
 
       <listitem>
         <para>
-          Fixed a <literal>BDB</literal>-related <literal
role="stmt">ALTER
-          TABLE</literal> bug with dropping a column and shutting down
-          immediately thereafter.
+          Fixed a <literal>BDB</literal>-related
+          <literal role="stmt">ALTER TABLE</literal> bug with dropping a
+          column and shutting down immediately thereafter.
         </para>
       </listitem>
 

@@ -1491,7 +1491,8 @@
       <listitem>
         <para>
           <literal>InnoDB</literal> now allows foreign key constraints
-          to be added through the <literal role="stmt">ALTER TABLE</literal>
syntax.
+          to be added through the <literal role="stmt">ALTER
+          TABLE</literal> syntax.
         </para>
       </listitem>
 

@@ -1551,9 +1552,10 @@
 
       <listitem>
         <para>
-          Fixed unlikely core-dump bug when using <literal role="stmt">DROP
-          TABLE</literal> on a table that was in use by a thread that
-          also used queries on only temporary tables.
+          Fixed unlikely core-dump bug when using
+          <literal role="stmt">DROP TABLE</literal> on a table that was
+          in use by a thread that also used queries on only temporary
+          tables.
         </para>
       </listitem>
 

@@ -1720,9 +1722,9 @@
         <para>
           Fixed problem with one thread using an
           <literal>InnoDB</literal> table and another thread doing an
-          <literal role="stmt">ALTER TABLE</literal> on the same table.
Before that,
-          <command>mysqld</command> could crash with an assertion
-          failure in <filename>row0row.c</filename>, line 474.
+          <literal role="stmt">ALTER TABLE</literal> on the same table.
+          Before that, <command>mysqld</command> could crash with an
+          assertion failure in <filename>row0row.c</filename>, line 474.
         </para>
       </listitem>
 

@@ -2039,8 +2041,9 @@
 
       <listitem>
         <para>
-          Fixed core dump bug in <literal role="stmt">ALTER TABLE</literal>
on a
-          <literal>TEMPORARY</literal> <literal>InnoDB</literal>
table.
+          Fixed core dump bug in <literal role="stmt">ALTER
+          TABLE</literal> on a <literal>TEMPORARY</literal>
+          <literal>InnoDB</literal> table.
         </para>
       </listitem>
 

@@ -2532,7 +2535,8 @@
       <listitem>
         <para>
           Don't force everything to lowercase on Windows. (To fix
-          problem with Windows and <literal role="stmt">ALTER
TABLE</literal>.) Now
+          problem with Windows and <literal role="stmt">ALTER
+          TABLE</literal>.) Now
           <option>--lower_case_table_names</option> also works on Unix.
         </para>
       </listitem>

@@ -2623,8 +2627,8 @@
 
       <listitem>
         <para>
-          Fixed overflow bug with <literal role="stmt">ALTER TABLE</literal>
and
-          <literal>MERGE</literal> tables.
+          Fixed overflow bug with <literal role="stmt">ALTER
+          TABLE</literal> and <literal>MERGE</literal> tables.
         </para>
       </listitem>
 

@@ -2770,8 +2774,8 @@
         <para>
           Fixed bug when converting <literal>BIGINT UNSIGNED</literal>
           to <literal>DOUBLE</literal>. This caused a problem when doing
-          comparisons with <literal role="type">BIGINT</literal> values
outside of
-          the signed range.
+          comparisons with <literal role="type">BIGINT</literal> values
+          outside of the signed range.
         </para>
       </listitem>
 

@@ -3172,9 +3176,9 @@
 
       <listitem>
         <para>
-          Fixed bug in <literal role="stmt">ALTER TABLE</literal> and
<literal>LOAD
-          DATA INFILE</literal> that disabled key-sorting. These
-          commands should now be faster in most cases.
+          Fixed bug in <literal role="stmt">ALTER TABLE</literal> and
+          <literal>LOAD DATA INFILE</literal> that disabled key-sorting.
+          These commands should now be faster in most cases.
         </para>
       </listitem>
 

@@ -3188,8 +3192,8 @@
 
       <listitem>
         <para>
-          Fixed problem with <literal role="stmt">ALTER TABLE</literal> to
-          <literal>InnoDB</literal> tables on FreeBSD.
+          Fixed problem with <literal role="stmt">ALTER TABLE</literal>
+          to <literal>InnoDB</literal> tables on FreeBSD.
         </para>
       </listitem>
 

@@ -3516,8 +3520,8 @@
 
       <listitem>
         <para>
-          <literal role="stmt">ALTER TABLE</literal> now remembers the old
-          <literal>UNION=()</literal> definition.
+          <literal role="stmt">ALTER TABLE</literal> now remembers the
+          old <literal>UNION=()</literal> definition.
         </para>
       </listitem>
 

@@ -3806,8 +3810,8 @@
 
       <listitem>
         <para>
-          <literal role="stmt">ALTER TABLE</literal> can now be used to
change the
-          definition for a <literal>MERGE</literal> table.
+          <literal role="stmt">ALTER TABLE</literal> can now be used to
+          change the definition for a <literal>MERGE</literal> table.
         </para>
       </listitem>
 

@@ -4587,8 +4591,8 @@
       <listitem>
         <para>
           Allow <literal>RESTRICT</literal> and
-          <literal>CASCADE</literal> after <literal role="stmt">DROP
TABLE</literal>
-          to make porting easier.
+          <literal>CASCADE</literal> after <literal role="stmt">DROP
+          TABLE</literal> to make porting easier.
         </para>
       </listitem>
 

@@ -5550,8 +5554,9 @@
 
       <listitem>
         <para>
-          Fixed a problem when using many pending <literal role="stmt">DROP
-          TABLE</literal> statements at the same time.
+          Fixed a problem when using many pending
+          <literal role="stmt">DROP TABLE</literal> statements at the
+          same time.
         </para>
       </listitem>
 

@@ -5627,18 +5632,19 @@
 
       <listitem>
         <para>
-          Changed <literal role="stmt">ALTER TABLE</literal>,
<literal>LOAD DATA
-          INFILE</literal> on empty tables and <literal>INSERT ...
-          SELECT ...</literal> on empty tables to create non-unique
-          indexes in a separate batch with sorting. This makes these
-          statements much faster when you have many indexes.
+          Changed <literal role="stmt">ALTER TABLE</literal>,
+          <literal>LOAD DATA INFILE</literal> on empty tables and
+          <literal>INSERT ... SELECT ...</literal> on empty tables to
+          create non-unique indexes in a separate batch with sorting.
+          This makes these statements much faster when you have many
+          indexes.
         </para>
       </listitem>
 
       <listitem>
         <para>
-          <literal role="stmt">ALTER TABLE</literal> now logs the first used
-          insert_id correctly.
+          <literal role="stmt">ALTER TABLE</literal> now logs the first
+          used insert_id correctly.
         </para>
       </listitem>
 

@@ -6710,8 +6716,8 @@
 
       <listitem>
         <para>
-          Fixed that <literal role="stmt">DROP TABLE</literal> is logged in
the
-          update log.
+          Fixed that <literal role="stmt">DROP TABLE</literal> is logged
+          in the update log.
         </para>
       </listitem>
 

@@ -7814,8 +7820,8 @@
 
       <listitem>
         <para>
-          Adding a column after the last field with <literal role="stmt">ALTER
-          TABLE</literal> didn't work.
+          Adding a column after the last field with
+          <literal role="stmt">ALTER TABLE</literal> didn't work.
         </para>
       </listitem>
 


Modified: trunk/refman-4.1/news-4.0.xml
===================================================================
--- trunk/refman-4.1/news-4.0.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/news-4.0.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 16, Lines Added: 47, Lines Deleted: 42; 8783 bytes

@@ -1759,10 +1759,10 @@
         <para>
           InnoDB: Release the dictionary latch during a long cascaded
           <literal>FOREIGN KEY</literal> operation, so that we do not
-          starve other users doing <literal role="stmt">CREATE
TABLE</literal> or
-          other DDL operations. This caused a notorious 'Long semaphore
-          wait' message to be printed to the <filename>.err</filename>
-          log. (Bug #5961)
+          starve other users doing <literal role="stmt">CREATE
+          TABLE</literal> or other DDL operations. This caused a
+          notorious 'Long semaphore wait' message to be printed to the
+          <filename>.err</filename> log. (Bug #5961)
         </para>
       </listitem>
 

@@ -2113,9 +2113,9 @@
 
       <listitem>
         <para>
-          Fixed that when a multiple-table <literal role="stmt">DROP
TABLE</literal>
-          failed to drop a table on the master server, the error code
-          was not written to the binary log. (Bug #4553)
+          Fixed that when a multiple-table <literal role="stmt">DROP
+          TABLE</literal> failed to drop a table on the master server,
+          the error code was not written to the binary log. (Bug #4553)
         </para>
       </listitem>
 

@@ -2912,7 +2912,8 @@
         <para>
           <literal>ENGINE</literal> is now a synonym for the
           <literal>TYPE</literal> option for <literal
role="stmt">CREATE
-          TABLE</literal> and <literal role="stmt">ALTER
TABLE</literal>.
+          TABLE</literal> and <literal role="stmt">ALTER
+          TABLE</literal>.
         </para>
       </listitem>
 

@@ -3330,8 +3331,8 @@
           <literal>realpath()</literal> doesn't work. (Before one could
           use <literal>CREATE TABLE .. DATA DIRECTORY=..</literal> even
           if <literal>HAVE_BROKEN_REALPATH</literal> was defined. This
-          is now disabled to avoid problems when running <literal role="stmt">ALTER
-          TABLE</literal>).
+          is now disabled to avoid problems when running
+          <literal role="stmt">ALTER TABLE</literal>).
         </para>
       </listitem>
 

@@ -3589,8 +3590,8 @@
       <listitem>
         <para>
           Fixed a crash in an open <literal>HANDLER</literal> when an
-          <literal role="stmt">ALTER TABLE</literal> was executed in a
different
-          connection. (Bug #1826)
+          <literal role="stmt">ALTER TABLE</literal> was executed in a
+          different connection. (Bug #1826)
         </para>
       </listitem>
 

@@ -4196,9 +4197,9 @@
           Added option <option>--sql-mode=NO_DIR_IN_CREATE</option> to
           make it possible for slaves to ignore <literal>INDEX
           DIRECTORY</literal> and <literal>DATA DIRECTORY</literal>
-          options given to <literal role="stmt">CREATE TABLE</literal>. When
this is
-          mode is on, <literal>SHOW CREATE TABLE</literal> does not show
-          the given directories.
+          options given to <literal role="stmt">CREATE TABLE</literal>.
+          When this is mode is on, <literal>SHOW CREATE TABLE</literal>
+          does not show the given directories.
         </para>
       </listitem>
 

@@ -5319,13 +5320,13 @@
           This bug had been fixed in 4.0.13, but in a manner which
           caused an unlikely inconvenience: If the 3.23 master died
           brutally (power failure), without having enough time to
-          automatically write <literal role="stmt">DROP TABLE</literal>
statements
-          to its binary log, then the 4.0.13 slave would not notice the
-          temporary tables have to be dropped, until the slave
-          <command>mysqld</command> server is restarted. This minor
-          inconvenience is fixed in 3.23.57 and 4.0.14 (meaning the
-          master must be upgraded to 3.23.57 and the slave to 4.0.14 to
-          remove the inconvenience). (Bug #254)
+          automatically write <literal role="stmt">DROP TABLE</literal>
+          statements to its binary log, then the 4.0.13 slave would not
+          notice the temporary tables have to be dropped, until the
+          slave <command>mysqld</command> server is restarted. This
+          minor inconvenience is fixed in 3.23.57 and 4.0.14 (meaning
+          the master must be upgraded to 3.23.57 and the slave to 4.0.14
+          to remove the inconvenience). (Bug #254)
         </para>
       </listitem>
 

@@ -5547,9 +5548,10 @@
 
       <listitem>
         <para>
-          When using a non-existing table type with <literal role="stmt">CREATE
-          TABLE</literal>, first try if the default table type exists
-          before falling back to <literal>MyISAM</literal>.
+          When using a non-existing table type with
+          <literal role="stmt">CREATE TABLE</literal>, first try if the
+          default table type exists before falling back to
+          <literal>MyISAM</literal>.
         </para>
       </listitem>
 

@@ -6157,8 +6159,8 @@
       <listitem>
         <para>
           Fixed deadlock when doing <literal>LOCK TABLE</literal>
-          followed by <literal role="stmt">DROP TABLE</literal> in the same
thread.
-          In this case one could still kill the thread with
+          followed by <literal role="stmt">DROP TABLE</literal> in the
+          same thread. In this case one could still kill the thread with
           <literal>KILL</literal>.
         </para>
       </listitem>

@@ -6463,8 +6465,8 @@
           (default on Windows) and you had tables or databases with
           mixed case on disk, then executing <literal>SHOW TABLE
           STATUS</literal> followed with <literal>DROP
-          DATABASE</literal> or <literal role="stmt">DROP
TABLE</literal> could fail
-          with <literal>Errcode 13</literal>.
+          DATABASE</literal> or <literal role="stmt">DROP
+          TABLE</literal> could fail with <literal>Errcode
13</literal>.
         </para>
       </listitem>
 

@@ -8053,8 +8055,8 @@
 
       <listitem>
         <para>
-          Fixed a bug with <literal role="type">BIGINT</literal> values and
quoted
-          strings.
+          Fixed a bug with <literal role="type">BIGINT</literal> values
+          and quoted strings.
         </para>
       </listitem>
 

@@ -8720,7 +8722,8 @@
       <listitem>
         <para>
           <literal>InnoDB</literal> now allows foreign key constraints
-          to be added through the <literal role="stmt">ALTER TABLE</literal>
syntax.
+          to be added through the <literal role="stmt">ALTER
+          TABLE</literal> syntax.
         </para>
       </listitem>
 

@@ -9309,8 +9312,8 @@
       <listitem>
         <para>
           Extended <literal>MODIFY</literal> and
-          <literal>CHANGE</literal> in <literal role="stmt">ALTER
TABLE</literal> to
-          accept the <literal>FIRST</literal> and
+          <literal>CHANGE</literal> in <literal role="stmt">ALTER
+          TABLE</literal> to accept the <literal>FIRST</literal> and
           <literal>AFTER</literal> keywords.
         </para>
       </listitem>

@@ -9398,10 +9401,11 @@
 
       <listitem>
         <para>
-          Unsigned <literal role="type">BIGINT</literal> constants now work.
-          <literal role="func">MIN()</literal> and
+          Unsigned <literal role="type">BIGINT</literal> constants now
+          work. <literal role="func">MIN()</literal> and
           <literal role="func">MAX()</literal> now handle signed and
-          unsigned <literal role="type">BIGINT</literal> numbers correctly.
+          unsigned <literal role="type">BIGINT</literal> numbers
+          correctly.
         </para>
       </listitem>
 

@@ -9432,9 +9436,10 @@
 
       <listitem>
         <para>
-          <literal>DROP DATABASE</literal> now executes a <literal
role="stmt">DROP
-          TABLE</literal> on all tables in the database, which fixes a
-          problem with <literal>InnoDB</literal> tables.
+          <literal>DROP DATABASE</literal> now executes a
+          <literal role="stmt">DROP TABLE</literal> on all tables in the
+          database, which fixes a problem with <literal>InnoDB</literal>
+          tables.
         </para>
       </listitem>
 

@@ -9623,8 +9628,8 @@
         <para>
           Implemented <quote>repair by sort</quote> for
           <literal>FULLTEXT</literal> indexes. <literal>REPAIR
-          TABLE</literal>, <literal role="stmt">ALTER TABLE</literal>,
and
-          <literal>OPTIMIZE TABLE</literal> for tables with
+          TABLE</literal>, <literal role="stmt">ALTER TABLE</literal>,
+          and <literal>OPTIMIZE TABLE</literal> for tables with
           <literal>FULLTEXT</literal> indexes are now up to 100 times
           faster.
         </para>


Modified: trunk/refman-4.1/optimization.xml
===================================================================
--- trunk/refman-4.1/optimization.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/optimization.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 17, Lines Added: 64, Lines Deleted: 57; 11019 bytes

@@ -1760,9 +1760,9 @@
       </para>
 
       <para>
-        To fix this disparity between column lengths, use <literal
role="stmt">ALTER
-        TABLE</literal> to lengthen <literal>ActualPC</literal> from 10
-        characters to 15 characters:
+        To fix this disparity between column lengths, use
+        <literal role="stmt">ALTER TABLE</literal> to lengthen
+        <literal>ActualPC</literal> from 10 characters to 15 characters:
       </para>
 
 <programlisting>

@@ -4056,8 +4056,8 @@
 
             <listitem>
               <para>
-                Optionally create the table with <literal role="stmt">CREATE
-                TABLE</literal>.
+                Optionally create the table with
+                <literal role="stmt">CREATE TABLE</literal>.
               </para>
             </listitem>
 

@@ -5774,9 +5774,11 @@
             Use the most efficient (smallest) data types possible. MySQL
             has many specialized types that save disk space and memory.
             For example, use the smaller integer types if possible to
-            get smaller tables. <literal role="type">MEDIUMINT</literal> is
often a
-            better choice than <literal role="type">INT</literal> because a
-            <literal role="type">MEDIUMINT</literal> column uses 25% less
space.
+            get smaller tables. <literal role="type">MEDIUMINT</literal>
+            is often a better choice than
+            <literal role="type">INT</literal> because a
+            <literal role="type">MEDIUMINT</literal> column uses 25%
+            less space.
           </para>
         </listitem>
 

@@ -5799,8 +5801,9 @@
             but unfortunately may waste some space. See
             <xref linkend="myisam-table-formats"/>. You can hint that
             you want to have fixed length rows even if you have
-            <literal>VARCHAR</literal> columns with the <literal
role="stmt">CREATE
-            TABLE</literal> option <literal>ROW_FORMAT=FIXED</literal>.
+            <literal>VARCHAR</literal> columns with the
+            <literal role="stmt">CREATE TABLE</literal> option
+            <literal>ROW_FORMAT=FIXED</literal>.
           </para>
         </listitem>
 

@@ -5920,11 +5923,11 @@
         Prefixes can be up to 1000 bytes long (767 bytes for
         <literal>InnoDB</literal> tables). (Before MySQL 4.1.2, the
         limit is 255 bytes for all tables.) Note that prefix limits are
-        measured in bytes, whereas the prefix length in <literal role="stmt">CREATE
-        TABLE</literal> statements is interpreted as number of
-        characters. <emphasis>Be sure to take this into account when
-        specifying a prefix length for a column that uses a multi-byte
-        character set</emphasis>.
+        measured in bytes, whereas the prefix length in
+        <literal role="stmt">CREATE TABLE</literal> statements is
+        interpreted as number of characters. <emphasis>Be sure to take
+        this into account when specifying a prefix length for a column
+        that uses a multi-byte character set</emphasis>.
       </para>
 
       <para>

@@ -7325,13 +7328,13 @@
             of executing statements for a table, some of those
             statements modify the table, MySQL may collect statistics.
             (This may occur for bulk inserts or deletes, or some
-            <literal role="stmt">ALTER TABLE</literal> statements, for
example.) If
-            this happens, the statistics are collected using whatever
-            value <literal>myisam_stats_method</literal> has at the
-            time. Thus, if you collect statistics using one method, but
-            <literal>myisam_stats_method</literal> is set to the other
-            method when a table's statistics are collected automatically
-            later, the other method will be used.
+            <literal role="stmt">ALTER TABLE</literal> statements, for
+            example.) If this happens, the statistics are collected
+            using whatever value <literal>myisam_stats_method</literal>
+            has at the time. Thus, if you collect statistics using one
+            method, but <literal>myisam_stats_method</literal> is set to
+            the other method when a table's statistics are collected
+            automatically later, the other method will be used.
           </para>
         </listitem>
 

@@ -8192,9 +8195,9 @@
           the changed table. A table can be changed by many types of
           statements, such as <literal>INSERT</literal>,
           <literal>UPDATE</literal>, <literal>DELETE</literal>,
-          <literal>TRUNCATE</literal>, <literal role="stmt">ALTER
TABLE</literal>,
-          <literal role="stmt">DROP TABLE</literal>, or <literal>DROP
-          DATABASE</literal>.
+          <literal>TRUNCATE</literal>, <literal role="stmt">ALTER
+          TABLE</literal>, <literal role="stmt">DROP TABLE</literal>,
or
+          <literal>DROP DATABASE</literal>.
         </para>
 
         <para>

@@ -9708,10 +9711,10 @@
             </para>
 
             <para>
-              The thread is processing an <literal role="stmt">ALTER
TABLE</literal>
-              statement. This state occurs after the table with the new
-              structure has been created but before rows are copied into
-              it.
+              The thread is processing an <literal role="stmt">ALTER
+              TABLE</literal> statement. This state occurs after the
+              table with the new structure has been created but before
+              rows are copied into it.
             </para>
           </listitem>
 

@@ -9952,9 +9955,10 @@
 
             <para>
               This occurs at the end but before the cleanup of
-              <literal role="stmt">ALTER TABLE</literal>,
<literal>DELETE</literal>,
-              <literal>INSERT</literal>,
<literal>SELECT</literal>, or
-              <literal>UPDATE</literal> statements.
+              <literal role="stmt">ALTER TABLE</literal>,
+              <literal>DELETE</literal>,
<literal>INSERT</literal>,
+              <literal>SELECT</literal>, or
<literal>UPDATE</literal>
+              statements.
             </para>
           </listitem>
 

@@ -10058,10 +10062,11 @@
             </para>
 
             <para>
-              This occurs before the initialization of <literal role="stmt">ALTER
-              TABLE</literal>, <literal>DELETE</literal>,
-              <literal>INSERT</literal>,
<literal>SELECT</literal>, or
-              <literal>UPDATE</literal> statements.
+              This occurs before the initialization of
+              <literal role="stmt">ALTER TABLE</literal>,
+              <literal>DELETE</literal>,
<literal>INSERT</literal>,
+              <literal>SELECT</literal>, or
<literal>UPDATE</literal>
+              statements.
             </para>
           </listitem>
 

@@ -10202,8 +10207,8 @@
             <para>
               The thread is trying to open a table. This is should be
               very fast procedure, unless something prevents opening.
-              For example, an <literal role="stmt">ALTER TABLE</literal> or a
-              <literal>LOCK TABLE</literal> statement can prevent
+              For example, an <literal role="stmt">ALTER TABLE</literal>
+              or a <literal>LOCK TABLE</literal> statement can prevent
               opening a table until the statement is finished.
             </para>
           </listitem>

@@ -10371,9 +10376,9 @@
             </para>
 
             <para>
-              The thread is processing an <literal role="stmt">ALTER
TABLE</literal>
-              statement, has created the new table, and is renaming it
-              to replace the original table.
+              The thread is processing an <literal role="stmt">ALTER
+              TABLE</literal> statement, has created the new table, and
+              is renaming it to replace the original table.
             </para>
           </listitem>
 

@@ -10559,8 +10564,8 @@
             </para>
 
             <para>
-              The thread is beginning an <literal role="stmt">ALTER
TABLE</literal>
-              operation.
+              The thread is beginning an <literal role="stmt">ALTER
+              TABLE</literal> operation.
             </para>
           </listitem>
 

@@ -10857,10 +10862,10 @@
               <literal>FLUSH TABLES</literal> or one of the following
               statements on the table in question: <literal>FLUSH TABLES
               <replaceable>tbl_name</replaceable></literal>,
-              <literal role="stmt">ALTER TABLE</literal>,
<literal>RENAME
-              TABLE</literal>, <literal>REPAIR TABLE</literal>,
-              <literal>ANALYZE TABLE</literal>, or <literal>OPTIMIZE
-              TABLE</literal>.
+              <literal role="stmt">ALTER TABLE</literal>,
+              <literal>RENAME TABLE</literal>, <literal>REPAIR
+              TABLE</literal>, <literal>ANALYZE TABLE</literal>, or
+              <literal>OPTIMIZE TABLE</literal>.
             </para>
           </listitem>
 

@@ -11902,10 +11907,11 @@
             </para>
 
             <para>
-              The slave is creating a table using the <literal role="stmt">CREATE
-              TABLE</literal> statement contained in the dump from the
-              master. Used for <literal>LOAD TABLE FROM MASTER</literal>
-              and <literal>LOAD DATA FROM MASTER</literal>.
+              The slave is creating a table using the
+              <literal role="stmt">CREATE TABLE</literal> statement
+              contained in the dump from the master. Used for
+              <literal>LOAD TABLE FROM MASTER</literal> and
+              <literal>LOAD DATA FROM MASTER</literal>.
             </para>
           </listitem>
 

@@ -13332,9 +13338,10 @@
               with the data file or index file. It works directly on the
               file to which the symlink points. Any temporary files are
               created in the directory where the data file or index file
-              is located. The same is true for the <literal role="stmt">ALTER
-              TABLE</literal>, <literal>OPTIMIZE TABLE</literal>, and
-              <literal>REPAIR TABLE</literal> statements.
+              is located. The same is true for the
+              <literal role="stmt">ALTER TABLE</literal>,
+              <literal>OPTIMIZE TABLE</literal>, and <literal>REPAIR
+              TABLE</literal> statements.
             </para>
           </listitem>
 

@@ -13409,9 +13416,9 @@
 
           <listitem>
             <para>
-              <literal role="stmt">ALTER TABLE</literal> ignores the
<literal>DATA
-              DIRECTORY</literal> and <literal>INDEX
DIRECTORY</literal>
-              table options.
+              <literal role="stmt">ALTER TABLE</literal> ignores the
+              <literal>DATA DIRECTORY</literal> and <literal>INDEX
+              DIRECTORY</literal> table options.
             </para>
           </listitem>
 


Modified: trunk/refman-4.1/programs-admin-util.xml
===================================================================
--- trunk/refman-4.1/programs-admin-util.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/programs-admin-util.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 2, Lines Added: 8, Lines Deleted: 7; 1689 bytes

@@ -877,9 +877,9 @@
         An alternative to using <command>myisamchk</command> is to use
         the <literal>REPAIR TABLE</literal>, <literal>ANALYZE
         TABLE</literal>, <literal>OPTIMIZE TABLE</literal>, or
-        <literal role="stmt">ALTER TABLE</literal>. These statements are
performed
-        by the server, which knows the proper full-text parameter values
-        to use.
+        <literal role="stmt">ALTER TABLE</literal>. These statements are
+        performed by the server, which knows the proper full-text
+        parameter values to use.
       </para>
 
     </refsection>

@@ -2807,10 +2807,11 @@
           <para>
             The number of integer columns that do not occupy the full
             byte range of their type. These are changed to a smaller
-            type. For example, a <literal role="type">BIGINT</literal> column
(eight
-            bytes) can be stored as a <literal role="type">TINYINT</literal>
column
-            (one byte) if all its values are in the range from
-            <literal>-128</literal> to <literal>127</literal>.
+            type. For example, a <literal role="type">BIGINT</literal>
+            column (eight bytes) can be stored as a
+            <literal role="type">TINYINT</literal> column (one byte) if
+            all its values are in the range from <literal>-128</literal>
+            to <literal>127</literal>.
           </para>
         </listitem>
 


Modified: trunk/refman-4.1/programs-client.xml
===================================================================
--- trunk/refman-4.1/programs-client.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/programs-client.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 6, Lines Added: 17, Lines Deleted: 16; 3691 bytes

@@ -5285,8 +5285,9 @@
           </para>
 
           <para>
-            Add a <literal role="stmt">DROP TABLE</literal> statement before
each
-            <literal role="stmt">CREATE TABLE</literal> statement.
+            Add a <literal role="stmt">DROP TABLE</literal> statement
+            before each <literal role="stmt">CREATE TABLE</literal>
+            statement.
           </para>
         </listitem>
 

@@ -5530,8 +5531,8 @@
 
           <para>
             Include all MySQL-specific table options in the
-            <literal role="stmt">CREATE TABLE</literal> statements. Before
MySQL
-            4.1.2, use <option>--all</option> instead.
+            <literal role="stmt">CREATE TABLE</literal> statements.
+            Before MySQL 4.1.2, use <option>--all</option> instead.
           </para>
         </listitem>
 

@@ -6211,8 +6212,8 @@
           </para>
 
           <para>
-            Do not write <literal role="stmt">CREATE TABLE</literal>
statements that
-            re-create each dumped table.
+            Do not write <literal role="stmt">CREATE TABLE</literal>
+            statements that re-create each dumped table.
           </para>
         </listitem>
 

@@ -6234,8 +6235,8 @@
           <para>
             Do not write any table row information (that is, do not dump
             table contents). This is very useful if you want to dump
-            only the <literal role="stmt">CREATE TABLE</literal> statement
for the
-            table.
+            only the <literal role="stmt">CREATE TABLE</literal>
+            statement for the table.
           </para>
         </listitem>
 

@@ -6549,12 +6550,12 @@
             While a <option>--single-transaction</option> dump is in
             process, to ensure a valid dump file (correct table contents
             and binary log position), no other connection should use the
-            following statements: <literal role="stmt">ALTER TABLE</literal>,
-            <literal role="stmt">DROP TABLE</literal>, <literal>RENAME
-            TABLE</literal>, <literal>TRUNCATE TABLE</literal>. A
-            consistent read is not isolated from those statements, so
-            use of them on a table to be dumped can cause the
-            <literal>SELECT</literal> performed by
+            following statements: <literal role="stmt">ALTER
+            TABLE</literal>, <literal role="stmt">DROP TABLE</literal>,
+            <literal>RENAME TABLE</literal>, <literal>TRUNCATE
+            TABLE</literal>. A consistent read is not isolated from
+            those statements, so use of them on a table to be dumped can
+            cause the <literal>SELECT</literal> performed by
             <command>mysqldump</command> to retrieve the table contents
             to obtain incorrect contents or fail.
           </para>

@@ -6681,8 +6682,8 @@
             Produce tab-separated data files. For each dumped table,
             <command>mysqldump</command> creates a
            
<filename><replaceable>tbl_name</replaceable>.sql</filename>
-            file that contains the <literal role="stmt">CREATE
TABLE</literal>
-            statement that creates the table, and a
+            file that contains the <literal role="stmt">CREATE
+            TABLE</literal> statement that creates the table, and a
            
<filename><replaceable>tbl_name</replaceable>.txt</filename>
             file that contains its data. The option value is the
             directory in which to write the files.


Modified: trunk/refman-4.1/replication.xml
===================================================================
--- trunk/refman-4.1/replication.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/replication.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 5, Lines Added: 40, Lines Deleted: 37; 6421 bytes

@@ -1400,11 +1400,11 @@
 
         <listitem>
           <para>
-            Use one or more <literal role="stmt">ALTER TABLE</literal>
statements on
-            the master to change the names of any database objects where
-            these names would be considered reserved words on the slave,
-            and change any SQL statements that use the old names to use
-            the new names instead.
+            Use one or more <literal role="stmt">ALTER TABLE</literal>
+            statements on the master to change the names of any database
+            objects where these names would be considered reserved words
+            on the slave, and change any SQL statements that use the old
+            names to use the new names instead.
           </para>
         </listitem>
 

@@ -1449,18 +1449,19 @@
 
         <para>
           Adding an <literal>AUTO_INCREMENT</literal> column to a table
-          with <literal role="stmt">ALTER TABLE</literal> might not produce
the same
-          ordering of the rows on the slave and the master. This occurs
-          because the order in which the rows are numbered depends on
-          the specific storage engine used for the table and the order
-          in which the rows were inserted. If it is important to have
-          the same order on the master and slave, the rows must be
-          ordered before assigning an <literal>AUTO_INCREMENT</literal>
-          number. Assuming that you want to add an
-          <literal>AUTO_INCREMENT</literal> column to the table
-          <literal>t1</literal>, the following statements produce a new
-          table <literal>t2</literal> identical to
<literal>t1</literal>
-          but with an <literal>AUTO_INCREMENT</literal> column:
+          with <literal role="stmt">ALTER TABLE</literal> might not
+          produce the same ordering of the rows on the slave and the
+          master. This occurs because the order in which the rows are
+          numbered depends on the specific storage engine used for the
+          table and the order in which the rows were inserted. If it is
+          important to have the same order on the master and slave, the
+          rows must be ordered before assigning an
+          <literal>AUTO_INCREMENT</literal> number. Assuming that you
+          want to add an <literal>AUTO_INCREMENT</literal> column to the
+          table <literal>t1</literal>, the following statements produce
+          a new table <literal>t2</literal> identical to
+          <literal>t1</literal> but with an
+          <literal>AUTO_INCREMENT</literal> column:
         </para>
 
 <programlisting>

@@ -1490,9 +1491,10 @@
           DIRECTORY</literal> and <literal>INDEX DIRECTORY</literal>
           table options. If a table definition includes any of those
           characteristics, create <literal>t2</literal> using a
-          <literal role="stmt">CREATE TABLE</literal> statement that is
identical to
-          the one used to create <literal>t1</literal>, but with the
-          addition of the <literal>AUTO_INCREMENT</literal> column.
+          <literal role="stmt">CREATE TABLE</literal> statement that is
+          identical to the one used to create <literal>t1</literal>, but
+          with the addition of the <literal>AUTO_INCREMENT</literal>
+          column.
         </para>
 
         <para>

@@ -1670,12 +1672,12 @@
               If on the master you have databases with different
               character sets from the global
               <literal>collation_server</literal> value, you should
-              design your <literal role="stmt">CREATE TABLE</literal>
statements so
-              that they do not implicitly rely on the default database's
-              character set, because there currently is a bug (Bug
-              #2326); a good workaround is to state the character set
-              and collation explicitly in <literal role="stmt">CREATE
-              TABLE</literal>.
+              design your <literal role="stmt">CREATE TABLE</literal>
+              statements so that they do not implicitly rely on the
+              default database's character set, because there currently
+              is a bug (Bug #2326); a good workaround is to state the
+              character set and collation explicitly in
+              <literal role="stmt">CREATE TABLE</literal>.
             </para>
           </listitem>
 

@@ -1795,17 +1797,18 @@
       <listitem>
         <para>
           If a <literal>DATA DIRECTORY</literal> or <literal>INDEX
-          DIRECTORY</literal> table option is used in a <literal
role="stmt">CREATE
-          TABLE</literal> statement on the master server, the table
-          option is also used on the slave. This can cause problems if
-          no corresponding directory exists in the slave host filesystem
-          or if it exists but is not accessible to the slave server. As
-          of MySQL 4.0.15, there is an <literal>sql_mode</literal>
-          option called <literal>NO_DIR_IN_CREATE</literal>. If the
-          slave server is run with this SQL mode enabled, it ignores the
-          <literal>DATA DIRECTORY</literal> and <literal>INDEX
-          DIRECTORY</literal> table options when replicating
-          <literal role="stmt">CREATE TABLE</literal> statements. The result
is that
+          DIRECTORY</literal> table option is used in a
+          <literal role="stmt">CREATE TABLE</literal> statement on the
+          master server, the table option is also used on the slave.
+          This can cause problems if no corresponding directory exists
+          in the slave host filesystem or if it exists but is not
+          accessible to the slave server. As of MySQL 4.0.15, there is
+          an <literal>sql_mode</literal> option called
+          <literal>NO_DIR_IN_CREATE</literal>. If the slave server is
+          run with this SQL mode enabled, it ignores the <literal>DATA
+          DIRECTORY</literal> and <literal>INDEX DIRECTORY</literal>
+          table options when replicating <literal role="stmt">CREATE
+          TABLE</literal> statements. The result is that
           <literal>MyISAM</literal> data and index files are created in
           the table's database directory.
         </para>


Modified: trunk/refman-4.1/se-innodb-core.xml
===================================================================
--- trunk/refman-4.1/se-innodb-core.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/se-innodb-core.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 21, Lines Added: 119, Lines Deleted: 105; 18973 bytes

@@ -840,7 +840,8 @@
 
         <listitem>
           <para>
-            Issue this <literal role="stmt">ALTER TABLE</literal> statement:
+            Issue this <literal role="stmt">ALTER TABLE</literal>
+            statement:
           </para>
 
 <programlisting>

@@ -864,7 +865,8 @@
 
         <listitem>
           <para>
-            Issue this <literal role="stmt">ALTER TABLE</literal> statement:
+            Issue this <literal role="stmt">ALTER TABLE</literal>
+            statement:
           </para>
 
 <programlisting>

@@ -1992,8 +1994,8 @@
 
     <para>
       To create an <literal>InnoDB</literal> table, specify an
-      <literal>ENGINE = InnoDB</literal> option in the <literal
role="stmt">CREATE
-      TABLE</literal> statement:
+      <literal>ENGINE = InnoDB</literal> option in the
+      <literal role="stmt">CREATE TABLE</literal> statement:
     </para>
 
 <programlisting>

@@ -2188,13 +2190,14 @@
       <para>
         Make sure that you do not fill up the tablespace:
         <literal>InnoDB</literal> tables require a lot more disk space
-        than <literal>MyISAM</literal> tables. If an <literal
role="stmt">ALTER
-        TABLE</literal> operation runs out of space, it starts a
-        rollback, and that can take hours if it is disk-bound. For
-        inserts, <literal>InnoDB</literal> uses the insert buffer to
-        merge secondary index records to indexes in batches. That saves
-        a lot of disk I/O. For rollback, no such mechanism is used, and
-        the rollback can take 30 times longer than the insertion.
+        than <literal>MyISAM</literal> tables. If an
+        <literal role="stmt">ALTER TABLE</literal> operation runs out of
+        space, it starts a rollback, and that can take hours if it is
+        disk-bound. For inserts, <literal>InnoDB</literal> uses the
+        insert buffer to merge secondary index records to indexes in
+        batches. That saves a lot of disk I/O. For rollback, no such
+        mechanism is used, and the rollback can take 30 times longer
+        than the insertion.
       </para>
 
       <para>

@@ -2321,11 +2324,12 @@
         Beginning with MySQL 4.1.12, <literal>InnoDB</literal> supports
         the <literal>AUTO_INCREMENT =
         <replaceable>n</replaceable></literal> table option in
-        <literal role="stmt">ALTER TABLE</literal> statements, to set the
initial
-        counter value or alter the current counter value. The same is
-        true as of MySQL 4.1.14 for <literal role="stmt">CREATE
TABLE</literal>. The
-        effect of this option is canceled by a server restart, for
-        reasons discussed earlier in this section.
+        <literal role="stmt">ALTER TABLE</literal> statements, to set
+        the initial counter value or alter the current counter value.
+        The same is true as of MySQL 4.1.14 for
+        <literal role="stmt">CREATE TABLE</literal>. The effect of this
+        option is canceled by a server restart, for reasons discussed
+        earlier in this section.
       </para>
 
     </section>

@@ -2564,16 +2568,16 @@
       </para>
 
       <para>
-        If MySQL reports an error number 1005 from a <literal role="stmt">CREATE
-        TABLE</literal> statement, and the error message refers to errno
-        150, table creation failed because a foreign key constraint was
-        not correctly formed. Similarly, if an <literal role="stmt">ALTER
-        TABLE</literal> fails and it refers to errno 150, that means a
-        foreign key definition would be incorrectly formed for the
-        altered table. Starting from MySQL 4.0.13, you can use
-        <literal>SHOW INNODB STATUS</literal> to display a detailed
-        explanation of the latest <literal>InnoDB</literal> foreign key
-        error in the server.
+        If MySQL reports an error number 1005 from a
+        <literal role="stmt">CREATE TABLE</literal> statement, and the
+        error message refers to errno 150, table creation failed because
+        a foreign key constraint was not correctly formed. Similarly, if
+        an <literal role="stmt">ALTER TABLE</literal> fails and it
+        refers to errno 150, that means a foreign key definition would
+        be incorrectly formed for the altered table. Starting from MySQL
+        4.0.13, you can use <literal>SHOW INNODB STATUS</literal> to
+        display a detailed explanation of the latest
+        <literal>InnoDB</literal> foreign key error in the server.
       </para>
 
       <important>

@@ -2762,7 +2766,8 @@
       <para>
         <emphasis role="bold">Remember to create the required indexes
         first</emphasis>. You can also add a self-referential foreign
-        key constraint to a table using <literal role="stmt">ALTER
TABLE</literal>.
+        key constraint to a table using <literal role="stmt">ALTER
+        TABLE</literal>.
       </para>
 
       <indexterm>

@@ -2781,7 +2786,8 @@
 
       <para>
         Starting from MySQL 4.0.13, <literal>InnoDB</literal> supports
-        the use of <literal role="stmt">ALTER TABLE</literal> to drop foreign
keys:
+        the use of <literal role="stmt">ALTER TABLE</literal> to drop
+        foreign keys:
       </para>
 
 <programlisting>

@@ -2826,8 +2832,8 @@
 
       <para>
         You cannot add a foreign key and drop a foreign key in separate
-        clauses of a single <literal role="stmt">ALTER TABLE</literal>
statement.
-        Separate statements are required.
+        clauses of a single <literal role="stmt">ALTER TABLE</literal>
+        statement. Separate statements are required.
       </para>
 
       <para>

@@ -2851,20 +2857,22 @@
       </para>
 
       <para>
-        Before MySQL 3.23.50, <literal role="stmt">ALTER TABLE</literal> or
-        <literal>CREATE INDEX</literal> should not be used in connection
-        with tables that have foreign key constraints or that are
-        referenced in foreign key constraints: Any <literal role="stmt">ALTER
-        TABLE</literal> removes all foreign key constraints defined for
-        the table. You should not use <literal role="stmt">ALTER
TABLE</literal>
-        with the referenced table, either. Instead, use <literal role="stmt">DROP
-        TABLE</literal> and <literal role="stmt">CREATE TABLE</literal>
to modify
-        the schema. When MySQL does an <literal role="stmt">ALTER
TABLE</literal> it
-        may internally use <literal>RENAME TABLE</literal>, and that
-        confuses the foreign key constraints that refer to the table. In
-        MySQL, a <literal>CREATE INDEX</literal> statement is processed
-        as an <literal role="stmt">ALTER TABLE</literal>, so the same
considerations
-        apply.
+        Before MySQL 3.23.50, <literal role="stmt">ALTER TABLE</literal>
+        or <literal>CREATE INDEX</literal> should not be used in
+        connection with tables that have foreign key constraints or that
+        are referenced in foreign key constraints: Any
+        <literal role="stmt">ALTER TABLE</literal> removes all foreign
+        key constraints defined for the table. You should not use
+        <literal role="stmt">ALTER TABLE</literal> with the referenced
+        table, either. Instead, use <literal role="stmt">DROP
+        TABLE</literal> and <literal role="stmt">CREATE TABLE</literal>
+        to modify the schema. When MySQL does an
+        <literal role="stmt">ALTER TABLE</literal> it may internally use
+        <literal>RENAME TABLE</literal>, and that confuses the foreign
+        key constraints that refer to the table. In MySQL, a
+        <literal>CREATE INDEX</literal> statement is processed as an
+        <literal role="stmt">ALTER TABLE</literal>, so the same
+        considerations apply.
       </para>
 
       <para>

@@ -2928,14 +2936,15 @@
         keys. It also speeds up the import operation. Setting
         <literal>FOREIGN_KEY_CHECKS</literal> to 0 can also be useful
         for ignoring foreign key constraints during <literal>LOAD
-        DATA</literal> or <literal role="stmt">ALTER TABLE</literal>
operations.
-        However, even if <literal>FOREIGN_KEY_CHECKS=0</literal>, InnoDB
-        does not allow the creation of a foreign key constraint where a
-        column references a non-matching column type. Also, if an
+        DATA</literal> or <literal role="stmt">ALTER TABLE</literal>
+        operations. However, even if
+        <literal>FOREIGN_KEY_CHECKS=0</literal>, InnoDB does not allow
+        the creation of a foreign key constraint where a column
+        references a non-matching column type. Also, if an
         <literal>InnoDB</literal> table has foreign key constraints,
-        <literal role="stmt">ALTER TABLE</literal> cannot be used to change
the
-        table to use another storage engine. To alter the storage
-        engine, you must drop any foreign key constraints first.
+        <literal role="stmt">ALTER TABLE</literal> cannot be used to
+        change the table to use another storage engine. To alter the
+        storage engine, you must drop any foreign key constraints first.
         <literal>FOREIGN_KEY_CHECKS</literal> is available starting from
         MySQL 3.23.52 and 4.0.3.
       </para>

@@ -3085,8 +3094,8 @@
           tables sharing the foreign key relation use
           <literal>InnoDB</literal>. For example, suppose you have
           started replication, and then create two tables on the master
-          using the following <literal role="stmt">CREATE TABLE</literal>
-          statements:
+          using the following <literal role="stmt">CREATE
+          TABLE</literal> statements:
 
 <programlisting>
 CREATE TABLE fc1 (

@@ -3651,8 +3660,8 @@
         even if forced recovery is used. If you know that a certain
         table is causing a crash in rollback, you can drop it. You can
         use this also to stop a runaway rollback caused by a failing
-        mass import or <literal role="stmt">ALTER TABLE</literal>. You can
kill the
-        <command>mysqld</command> process and set
+        mass import or <literal role="stmt">ALTER TABLE</literal>. You
+        can kill the <command>mysqld</command> process and set
         <literal>innodb_force_recovery</literal> to
<literal>3</literal>
         to bring the database up without the rollback, then
         <literal>DROP</literal> the table that is causing the runaway

@@ -4251,18 +4260,19 @@
       </para>
 
       <para>
-        Note that consistent read does not work over <literal role="stmt">DROP
-        TABLE</literal> and over <literal role="stmt">ALTER
TABLE</literal>.
-        Consistent read does not work over <literal role="stmt">DROP
TABLE</literal>
-        because MySQL can't use a table that has been dropped and
+        Note that consistent read does not work over
+        <literal role="stmt">DROP TABLE</literal> and over
+        <literal role="stmt">ALTER TABLE</literal>. Consistent read does
+        not work over <literal role="stmt">DROP TABLE</literal> because
+        MySQL can't use a table that has been dropped and
         <literal>InnoDB</literal> destroys the table. Consistent read
-        does not work over <literal role="stmt">ALTER TABLE</literal> because
-        <literal role="stmt">ALTER TABLE</literal> works by making a
temporary copy
-        of the original table and deleting the original table when the
-        temporary copy is built. When you reissue a consistent read
-        within a transaction, rows in the new table are not visible
-        because those rows did not exist when the transaction's snapshot
-        was taken.
+        does not work over <literal role="stmt">ALTER TABLE</literal>
+        because <literal role="stmt">ALTER TABLE</literal> works by
+        making a temporary copy of the original table and deleting the
+        original table when the temporary copy is built. When you
+        reissue a consistent read within a transaction, rows in the new
+        table are not visible because those rows did not exist when the
+        transaction's snapshot was taken.
       </para>
 
     </section>

@@ -5155,8 +5165,9 @@
       <listitem>
         <para>
           Beware also of other big disk-bound operations. Use
-          <literal role="stmt">DROP TABLE</literal> and <literal
role="stmt">CREATE
-          TABLE</literal> to empty a table, not <literal>DELETE FROM
+          <literal role="stmt">DROP TABLE</literal> and
+          <literal role="stmt">CREATE TABLE</literal> to empty a table,
+          not <literal>DELETE FROM
           <replaceable>tbl_name</replaceable></literal>.
         </para>
       </listitem>

@@ -5374,17 +5385,17 @@
 </programlisting>
 
       <para>
-        The <literal role="stmt">CREATE TABLE</literal> syntax is just a way
to pass
-        a command to the <literal>InnoDB</literal> engine through
-        MySQL's SQL parser: The only things that matter are the table
-        name <literal>innodb_monitor</literal> and that it be an
+        The <literal role="stmt">CREATE TABLE</literal> syntax is just a
+        way to pass a command to the <literal>InnoDB</literal> engine
+        through MySQL's SQL parser: The only things that matter are the
+        table name <literal>innodb_monitor</literal> and that it be an
         <literal>InnoDB</literal> table. The structure of the table is
         not relevant at all for the <literal>InnoDB</literal> Monitor.
         If you shut down the server, the monitor does not restart
         automatically when you restart the server. You must drop the
-        monitor table and issue a new <literal role="stmt">CREATE
TABLE</literal>
-        statement to start the monitor. (This syntax may change in a
-        future release.)
+        monitor table and issue a new <literal role="stmt">CREATE
+        TABLE</literal> statement to start the monitor. (This syntax may
+        change in a future release.)
       </para>
 
       <para>

@@ -6181,7 +6192,8 @@
 
       <para>
         It can speed up index scans if you periodically perform a
-        <quote>null</quote> <literal role="stmt">ALTER
TABLE</literal> operation:
+        <quote>null</quote> <literal role="stmt">ALTER
TABLE</literal>
+        operation:
       </para>
 
 <programlisting>

@@ -7367,12 +7379,13 @@
         <para>
           Before MySQL 4.1.12, <literal>InnoDB</literal> does not
           support the <literal>AUTO_INCREMENT</literal> table option for
-          setting the initial sequence value in an <literal role="stmt">ALTER
-          TABLE</literal> statement. Before MySQL 4.1.14, the same is
-          true for <literal role="stmt">CREATE TABLE</literal>. To set the
value
-          with <literal>InnoDB</literal>, insert a dummy row with a
-          value one less and delete that dummy row, or insert the first
-          row with an explicit value specified.
+          setting the initial sequence value in an
+          <literal role="stmt">ALTER TABLE</literal> statement. Before
+          MySQL 4.1.14, the same is true for <literal role="stmt">CREATE
+          TABLE</literal>. To set the value with
+          <literal>InnoDB</literal>, insert a dummy row with a value one
+          less and delete that dummy row, or insert the first row with
+          an explicit value specified.
         </para>
       </listitem>
 

@@ -7410,14 +7423,14 @@
           <literal role="type">BIGINT</literal> to
           <literal>-9223372036854775808</literal> and <literal>BIGINT
           UNSIGNED</literal> to <literal>1</literal>. However,
-          <literal role="type">BIGINT</literal> values have 64 bits, so do
note that
-          if you were to insert one million rows per second, it would
-          still take nearly three hundred thousand years before
-          <literal role="type">BIGINT</literal> reached its upper bound. With
all
-          other integer type columns, a duplicate-key error results.
-          This is similar to how <literal>MyISAM</literal> works,
-          because it is mostly general MySQL behavior and not about any
-          storage engine in particular.
+          <literal role="type">BIGINT</literal> values have 64 bits, so
+          do note that if you were to insert one million rows per
+          second, it would still take nearly three hundred thousand
+          years before <literal role="type">BIGINT</literal> reached its
+          upper bound. With all other integer type columns, a
+          duplicate-key error results. This is similar to how
+          <literal>MyISAM</literal> works, because it is mostly general
+          MySQL behavior and not about any storage engine in particular.
         </para>
       </listitem>
 

@@ -7655,13 +7668,13 @@
 
       <para>
         A symptom of an out-of-sync data dictionary is that a
-        <literal role="stmt">CREATE TABLE</literal> statement fails. If this
occurs,
-        you should look in the server's error log. If the log says that
-        the table already exists inside the <literal>InnoDB</literal>
-        internal data dictionary, you have an orphaned table inside the
-        <literal>InnoDB</literal> tablespace files that has no
-        corresponding <filename>.frm</filename> file. The error message
-        looks like this:
+        <literal role="stmt">CREATE TABLE</literal> statement fails. If
+        this occurs, you should look in the server's error log. If the
+        log says that the table already exists inside the
+        <literal>InnoDB</literal> internal data dictionary, you have an
+        orphaned table inside the <literal>InnoDB</literal> tablespace
+        files that has no corresponding <filename>.frm</filename> file.
+        The error message looks like this:
       </para>
 
 <programlisting>

@@ -7680,14 +7693,15 @@
       <para>
         You can drop the orphaned table by following the instructions
         given in the error message. If you are still unable to use
-        <literal role="stmt">DROP TABLE</literal> successfully, the problem
may be
-        due to name completion in the <command>mysql</command> client.
-        To work around this problem, start the <command>mysql</command>
-        client with the <option>--skip-auto-rehash</option> option and
-        try <literal role="stmt">DROP TABLE</literal> again. (With name
completion
-        on, <command>mysql</command> tries to construct a list of table
-        names, which fails when a problem such as just described
-        exists.)
+        <literal role="stmt">DROP TABLE</literal> successfully, the
+        problem may be due to name completion in the
+        <command>mysql</command> client. To work around this problem,
+        start the <command>mysql</command> client with the
+        <option>--skip-auto-rehash</option> option and try
+        <literal role="stmt">DROP TABLE</literal> again. (With name
+        completion on, <command>mysql</command> tries to construct a
+        list of table names, which fails when a problem such as just
+        described exists.)
       </para>
 
       <para>


Modified: trunk/refman-4.1/spatial-extensions.xml
===================================================================
--- trunk/refman-4.1/spatial-extensions.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/spatial-extensions.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 4, Lines Added: 10, Lines Deleted: 9; 1949 bytes

@@ -2613,9 +2613,9 @@
       <para>
         MySQL provides a standard way of creating spatial columns for
         geometry types, for example, with <literal role="stmt">CREATE
-        TABLE</literal> or <literal role="stmt">ALTER TABLE</literal>.
Currently,
-        spatial columns are supported only for <literal>MyISAM</literal>
-        tables.
+        TABLE</literal> or <literal role="stmt">ALTER TABLE</literal>.
+        Currently, spatial columns are supported only for
+        <literal>MyISAM</literal> tables.
       </para>
 
       <remark role="help-description-end"/>

@@ -2624,8 +2624,8 @@
 
         <listitem>
           <para>
-            Use the <literal role="stmt">CREATE TABLE</literal> statement to
create
-            a table with a spatial column:
+            Use the <literal role="stmt">CREATE TABLE</literal>
+            statement to create a table with a spatial column:
           </para>
 
           <remark role="help-example"/>

@@ -2637,8 +2637,9 @@
 
         <listitem>
           <para>
-            Use the <literal role="stmt">ALTER TABLE</literal> statement to
add or
-            drop a spatial column to or from an existing table:
+            Use the <literal role="stmt">ALTER TABLE</literal> statement
+            to add or drop a spatial column to or from an existing
+            table:
           </para>
 
 <programlisting>

@@ -4916,8 +4917,8 @@
       </para>
 
       <para>
-        To drop spatial indexes, use <literal role="stmt">ALTER
TABLE</literal> or
-        <literal>DROP INDEX</literal>:
+        To drop spatial indexes, use <literal role="stmt">ALTER
+        TABLE</literal> or <literal>DROP INDEX</literal>:
       </para>
 
       <itemizedlist>


Modified: trunk/refman-4.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-data-definition.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/sql-syntax-data-definition.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 28, Lines Added: 132, Lines Deleted: 125; 22582 bytes

@@ -176,19 +176,20 @@
     <remark role="help-description-begin"/>
 
     <para>
-      <literal role="stmt">ALTER TABLE</literal> enables you to change the
structure
-      of an existing table. For example, you can add or delete columns,
-      create or destroy indexes, change the type of existing columns, or
-      rename columns or the table itself. You can also change the
-      comment for the table and type of the table.
+      <literal role="stmt">ALTER TABLE</literal> enables you to change
+      the structure of an existing table. For example, you can add or
+      delete columns, create or destroy indexes, change the type of
+      existing columns, or rename columns or the table itself. You can
+      also change the comment for the table and type of the table.
     </para>
 
     <remark role="help-description-end"/>
 
     <para>
       The syntax for many of the allowable alterations is similar to
-      clauses of the <literal role="stmt">CREATE TABLE</literal> statement.
See
-      <xref linkend="create-table"/>, for more information.
+      clauses of the <literal role="stmt">CREATE TABLE</literal>
+      statement. See <xref linkend="create-table"/>, for more
+      information.
     </para>
 
     <para>

@@ -199,8 +200,8 @@
     </para>
 
     <para>
-      If you use <literal role="stmt">ALTER TABLE</literal> to change a
column
-      specification but <literal>DESCRIBE
+      If you use <literal role="stmt">ALTER TABLE</literal> to change a
+      column specification but <literal>DESCRIBE
       <replaceable>tbl_name</replaceable></literal> indicates that your
       column was not changed, it is possible that MySQL ignored your
       modification for one of the reasons described in

@@ -212,17 +213,18 @@
     </para>
 
     <para>
-      In most cases, <literal role="stmt">ALTER TABLE</literal> works by
making a
-      temporary copy of the original table. The alteration is performed
-      on the copy, and then the original table is deleted and the new
-      one is renamed. While <literal role="stmt">ALTER TABLE</literal> is
executing,
-      the original table is readable by other clients. Updates and
-      writes to the table are stalled until the new table is ready, and
-      then are automatically redirected to the new table without any
-      failed updates. The temporary table is created in the database
-      directory of the new table. This can be different from the
-      database directory of the original table if <literal role="stmt">ALTER
-      TABLE</literal> is renaming the table to a different database.
+      In most cases, <literal role="stmt">ALTER TABLE</literal> works by
+      making a temporary copy of the original table. The alteration is
+      performed on the copy, and then the original table is deleted and
+      the new one is renamed. While <literal role="stmt">ALTER
+      TABLE</literal> is executing, the original table is readable by
+      other clients. Updates and writes to the table are stalled until
+      the new table is ready, and then are automatically redirected to
+      the new table without any failed updates. The temporary table is
+      created in the database directory of the new table. This can be
+      different from the database directory of the original table if
+      <literal role="stmt">ALTER TABLE</literal> is renaming the table
+      to a different database.
     </para>
 
     <para>

@@ -238,19 +240,19 @@
     </para>
 
     <para>
-      If you use any option to <literal role="stmt">ALTER TABLE</literal>
other than
-      <literal>RENAME</literal>, MySQL always creates a temporary table,
-      even if the data wouldn't strictly need to be copied (such as when
-      you change the name of a column). For <literal>MyISAM</literal>
-      tables, you can speed up the index re-creation operation (which is
-      the slowest part of the alteration process) by setting the
-      <literal>myisam_sort_buffer_size</literal> system variable to a
-      high value.
+      If you use any option to <literal role="stmt">ALTER
+      TABLE</literal> other than <literal>RENAME</literal>, MySQL
always
+      creates a temporary table, even if the data wouldn't strictly need
+      to be copied (such as when you change the name of a column). For
+      <literal>MyISAM</literal> tables, you can speed up the index
+      re-creation operation (which is the slowest part of the alteration
+      process) by setting the <literal>myisam_sort_buffer_size</literal>
+      system variable to a high value.
     </para>
 
     <para>
-      For information on troubleshooting <literal role="stmt">ALTER
TABLE</literal>,
-      see <xref linkend="alter-table-problems"/>.
+      For information on troubleshooting <literal role="stmt">ALTER
+      TABLE</literal>, see <xref linkend="alter-table-problems"/>.
     </para>
 
     <itemizedlist>

@@ -266,13 +268,13 @@
       <listitem>
         <para>
           <literal>IGNORE</literal> is a MySQL extension to standard
-          SQL. It controls how <literal role="stmt">ALTER TABLE</literal>
works if
-          there are duplicates on unique keys in the new table or if
-          warnings occur when strict mode is enabled. If
-          <literal>IGNORE</literal> is not specified, the copy is
-          aborted and rolled back if duplicate-key errors occur. If
-          <literal>IGNORE</literal> is specified, only the first row is
-          used of rows with duplicates on a unique key, The other
+          SQL. It controls how <literal role="stmt">ALTER
+          TABLE</literal> works if there are duplicates on unique keys
+          in the new table or if warnings occur when strict mode is
+          enabled. If <literal>IGNORE</literal> is not specified, the
+          copy is aborted and rolled back if duplicate-key errors occur.
+          If <literal>IGNORE</literal> is specified, only the first row
+          is used of rows with duplicates on a unique key, The other
           conflicting rows are deleted. Incorrect values are truncated
           to the closest matching acceptable value.
         </para>

@@ -281,13 +283,13 @@
       <listitem>
         <para>
           <replaceable>table_option</replaceable> signifies a table
-          option of the kind that can be used in the <literal role="stmt">CREATE
-          TABLE</literal> statement, such as <literal>ENGINE</literal>,
-          <literal>AUTO_INCREMENT</literal>, or
-          <literal>AVG_ROW_LENGTH</literal>.
+          option of the kind that can be used in the
+          <literal role="stmt">CREATE TABLE</literal> statement, such as
+          <literal>ENGINE</literal>,
<literal>AUTO_INCREMENT</literal>,
+          or <literal>AVG_ROW_LENGTH</literal>.
           (<xref linkend="create-table"/>, lists all table options.)
-          However, <literal role="stmt">ALTER TABLE</literal> ignores the
-          <literal>DATA DIRECTORY</literal> and <literal>INDEX
+          However, <literal role="stmt">ALTER TABLE</literal> ignores
+          the <literal>DATA DIRECTORY</literal> and <literal>INDEX
           DIRECTORY</literal> table options.
         </para>
 

@@ -329,10 +331,11 @@
         <para>
           You can issue multiple <literal>ADD</literal>,
           <literal>ALTER</literal>, <literal>DROP</literal>, and
-          <literal>CHANGE</literal> clauses in a single <literal
role="stmt">ALTER
-          TABLE</literal> statement, separated by commas. This is a
-          MySQL extension to standard SQL, which allows only one of each
-          clause per <literal role="stmt">ALTER TABLE</literal> statement.
For
+          <literal>CHANGE</literal> clauses in a single
+          <literal role="stmt">ALTER TABLE</literal> statement,
+          separated by commas. This is a MySQL extension to standard
+          SQL, which allows only one of each clause per
+          <literal role="stmt">ALTER TABLE</literal> statement. For
           example, to drop multiple columns in a single statement, do
           this:
         </para>

@@ -728,8 +731,8 @@
           </indexterm>
 
           Starting from MySQL 4.0.13, <literal>InnoDB</literal> supports
-          the use of <literal role="stmt">ALTER TABLE</literal> to drop
foreign
-          keys:
+          the use of <literal role="stmt">ALTER TABLE</literal> to drop
+          foreign keys:
         </para>
 
 <programlisting>

@@ -745,8 +748,8 @@
       <listitem>
         <para>
           You cannot add a foreign key and drop a foreign key in
-          separate clauses of a single <literal role="stmt">ALTER
TABLE</literal>
-          statement. You must use separate statements.
+          separate clauses of a single <literal role="stmt">ALTER
+          TABLE</literal> statement. You must use separate statements.
         </para>
       </listitem>
 

@@ -795,8 +798,8 @@
       <listitem>
         <para>
           Pending <literal>INSERT DELAYED</literal> statements are lost
-          if a table is write locked and <literal role="stmt">ALTER
TABLE</literal>
-          is used to modify the table structure.
+          if a table is write locked and <literal role="stmt">ALTER
+          TABLE</literal> is used to modify the table structure.
         </para>
       </listitem>
 

@@ -910,9 +913,9 @@
     </para>
 
     <para>
-      Here are some examples that show uses of <literal role="stmt">ALTER
-      TABLE</literal>. Begin with a table <literal>t1</literal> that is
-      created as shown here:
+      Here are some examples that show uses of
+      <literal role="stmt">ALTER TABLE</literal>. Begin with a table
+      <literal>t1</literal> that is created as shown here:
     </para>
 
 <programlisting>

@@ -1198,10 +1201,10 @@
 
     <para>
       In MySQL 3.22 or later, <literal>CREATE INDEX</literal> is mapped
-      to an <literal role="stmt">ALTER TABLE</literal> statement to create
indexes.
-      See <xref linkend="alter-table"/>. The <literal>CREATE
-      INDEX</literal> statement does not do anything prior to MySQL
-      3.22. For more information about indexes, see
+      to an <literal role="stmt">ALTER TABLE</literal> statement to
+      create indexes. See <xref linkend="alter-table"/>. The
+      <literal>CREATE INDEX</literal> statement does not do anything
+      prior to MySQL 3.22. For more information about indexes, see
       <xref linkend="mysql-indexes"/>.
     </para>
 

@@ -1209,9 +1212,10 @@
 
     <para>
       Normally, you create all indexes on a table at the time the table
-      itself is created with <literal role="stmt">CREATE TABLE</literal>. See
-      <xref linkend="create-table"/>. <literal>CREATE INDEX</literal>
-      enables you to add indexes to existing tables.
+      itself is created with <literal role="stmt">CREATE
+      TABLE</literal>. See <xref linkend="create-table"/>.
+      <literal>CREATE INDEX</literal> enables you to add indexes to
+      existing tables.
     </para>
 
     <para>

@@ -1678,9 +1682,9 @@
     <remark role="help-description-begin"/>
 
     <para>
-      <literal role="stmt">CREATE TABLE</literal> creates a table with the
given
-      name. You must have the <literal>CREATE</literal> privilege for
-      the table.
+      <literal role="stmt">CREATE TABLE</literal> creates a table with
+      the given name. You must have the <literal>CREATE</literal>
+      privilege for the table.
     </para>
 
     <para>

@@ -1717,9 +1721,9 @@
 
     <note>
       <para>
-        <literal role="stmt">CREATE TABLE</literal> does not automatically
commit
-        the current active transaction if you use the
-        <literal>TEMPORARY</literal> keyword.
+        <literal role="stmt">CREATE TABLE</literal> does not
+        automatically commit the current active transaction if you use
+        the <literal>TEMPORARY</literal> keyword.
       </para>
     </note>
 

@@ -1727,8 +1731,8 @@
       In MySQL 3.23 or later, the keywords <literal>IF NOT
       EXISTS</literal> prevent an error from occurring if the table
       exists. However, there is no verification that the existing table
-      has a structure identical to that indicated by the <literal
role="stmt">CREATE
-      TABLE</literal> statement.
+      has a structure identical to that indicated by the
+      <literal role="stmt">CREATE TABLE</literal> statement.
     </para>
 
     <note>

@@ -2205,8 +2209,8 @@
           <literal>InnoDB</literal> tables). (Before MySQL 4.1.2, the
           limit is 255 bytes for all tables.) Note that prefix limits
           are measured in bytes, whereas the prefix length in
-          <literal role="stmt">CREATE TABLE</literal> statements is
interpreted as
-          number of characters for non-binary data types
+          <literal role="stmt">CREATE TABLE</literal> statements is
+          interpreted as 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

@@ -2267,23 +2271,23 @@
           support checking of foreign key constraints. See
           <xref linkend="innodb"/>. Note that the <literal>FOREIGN
           KEY</literal> syntax in <literal>InnoDB</literal> is more
-          restrictive than the syntax presented for the <literal role="stmt">CREATE
-          TABLE</literal> statement at the beginning of this section:
-          The columns of the referenced table must always be explicitly
-          named. <literal>InnoDB</literal> supports both <literal>ON
-          DELETE</literal> and <literal>ON UPDATE</literal> actions on
-          foreign keys as of MySQL 3.23.50 and 4.0.8, respectively. For
-          the precise syntax, see
+          restrictive than the syntax presented for the
+          <literal role="stmt">CREATE TABLE</literal> statement at the
+          beginning of this section: The columns of the referenced table
+          must always be explicitly named. <literal>InnoDB</literal>
+          supports both <literal>ON DELETE</literal> and <literal>ON
+          UPDATE</literal> actions on foreign keys as of MySQL 3.23.50
+          and 4.0.8, respectively. For the precise syntax, see
           <xref linkend="innodb-foreign-key-constraints"/>.
         </para>
 
         <para>
           For other storage engines, MySQL Server parses and ignores the
           <literal>FOREIGN KEY</literal> and
-          <literal>REFERENCES</literal> syntax in <literal
role="stmt">CREATE
-          TABLE</literal> statements. The <literal>CHECK</literal>
-          clause is parsed but ignored by all storage engines. See
-          <xref linkend="ansi-diff-foreign-keys"/>.
+          <literal>REFERENCES</literal> syntax in
+          <literal role="stmt">CREATE TABLE</literal> statements. The
+          <literal>CHECK</literal> clause is parsed but ignored by all
+          storage engines. See <xref linkend="ansi-diff-foreign-keys"/>.
         </para>
 
         <important>

@@ -2356,9 +2360,9 @@
 
     <para>
       The <replaceable>table_option</replaceable> part of the
-      <literal role="stmt">CREATE TABLE</literal> syntax can be used in MySQL
3.23
-      and above. The <literal>=</literal> that separates an option name
-      and its value is optional as of MySQL 4.1.
+      <literal role="stmt">CREATE TABLE</literal> syntax can be used in
+      MySQL 3.23 and above. The <literal>=</literal> that separates an
+      option name and its value is optional as of MySQL 4.1.
     </para>
 
     <para>

@@ -2467,8 +2471,9 @@
       These options apply to all storage engines unless otherwise
       indicated. Options that do not apply to a given storage engine may
       be accepted and remembered as part of the table definition. Such
-      options then apply if you later use <literal role="stmt">ALTER
TABLE</literal>
-      to convert the table to use a different storage engine.
+      options then apply if you later use <literal role="stmt">ALTER
+      TABLE</literal> to convert the table to use a different storage
+      engine.
     </para>
 
     <itemizedlist>

@@ -2492,8 +2497,8 @@
 
         <para>
           For engines that support the <literal>AUTO_INCREMENT</literal>
-          table option in <literal role="stmt">CREATE TABLE</literal>
statements,
-          you can also use <literal>ALTER TABLE
+          table option in <literal role="stmt">CREATE TABLE</literal>
+          statements, you can also use <literal>ALTER TABLE
           <replaceable>tbl_name</replaceable> AUTO_INCREMENT =
           <replaceable>N</replaceable></literal> to reset the
           <literal>AUTO_INCREMENT</literal> value. The value cannot be

@@ -2832,15 +2837,15 @@
 
         <note>
           <para>
-            During <literal role="stmt">CREATE TABLE</literal>, if you
specify a row
-            format that the engine does support, the table will be
-            created using the storage engines default row format. The
-            information reported in this column in response to
-            <literal>SHOW TABLE STATUS</literal> is the actual row
+            During <literal role="stmt">CREATE TABLE</literal>, if you
+            specify a row format that the engine does support, the table
+            will be created using the storage engines default row
+            format. The information reported in this column in response
+            to <literal>SHOW TABLE STATUS</literal> is the actual row
             format used. This may differ from the value in the
             <literal>Create_options</literal> column because the
-            original <literal role="stmt">CREATE TABLE</literal> definition
is
-            retained during creation.
+            original <literal role="stmt">CREATE TABLE</literal>
+            definition is retained during creation.
           </para>
         </note>
       </listitem>

@@ -2877,15 +2882,16 @@
 
     <important>
       <para>
-        The original <literal role="stmt">CREATE TABLE</literal> statement,
-        including all specifications and table options are stored by
-        MySQL when the table is created. The information is retained so
-        that if you change storage engines, collations or other settings
-        using an <literal role="stmt">ALTER TABLE</literal> statement, the
original
-        table options specified are retained. This allows you to change
-        between <literal>InnoDB</literal> and
<literal>MyISAM</literal>
-        table types even though the row formats supported by the two
-        engines are different.
+        The original <literal role="stmt">CREATE TABLE</literal>
+        statement, including all specifications and table options are
+        stored by MySQL when the table is created. The information is
+        retained so that if you change storage engines, collations or
+        other settings using an <literal role="stmt">ALTER
+        TABLE</literal> statement, the original table options specified
+        are retained. This allows you to change between
+        <literal>InnoDB</literal> and <literal>MyISAM</literal>
table
+        types even though the row formats supported by the two engines
+        are different.
       </para>
 
       <para>

@@ -2967,11 +2973,12 @@
 
     <para>
       In a table resulting from <literal>CREATE TABLE ...
-      SELECT</literal>, columns named only in the <literal role="stmt">CREATE
-      TABLE</literal> part come first. Columns named in both parts or
-      only in the <literal>SELECT</literal> part come after that. The
-      data type of <literal>SELECT</literal> columns can be overridden
-      by also specifying the column in the <literal role="stmt">CREATE
+      SELECT</literal>, columns named only in the
+      <literal role="stmt">CREATE TABLE</literal> part come first.
+      Columns named in both parts or only in the
+      <literal>SELECT</literal> part come after that. The data type of
+      <literal>SELECT</literal> columns can be overridden by also
+      specifying the column in the <literal role="stmt">CREATE
       TABLE</literal> part.
     </para>
 

@@ -3077,9 +3084,9 @@
       <para>
         In some cases, MySQL silently changes column specifications from
         those given in a <literal role="stmt">CREATE TABLE</literal> or
-        <literal role="stmt">ALTER TABLE</literal> statement. These might be
changes
-        to a data type, to attributes associated with a data type, or to
-        an index specification.
+        <literal role="stmt">ALTER TABLE</literal> statement. These
+        might be changes to a data type, to attributes associated with a
+        data type, or to an index specification.
       </para>
 
       <para>

@@ -3469,10 +3476,10 @@
       <literal>DROP INDEX</literal> drops the index named
       <replaceable>index_name</replaceable> from the table
       <replaceable>tbl_name</replaceable>. In MySQL 3.22 or later,
-      <literal>DROP INDEX</literal> is mapped to an <literal
role="stmt">ALTER
-      TABLE</literal> statement to drop the index. See
-      <xref linkend="alter-table"/>. <literal>DROP INDEX</literal> does
-      not do anything prior to MySQL 3.22.
+      <literal>DROP INDEX</literal> is mapped to an
+      <literal role="stmt">ALTER TABLE</literal> statement to drop the
+      index. See <xref linkend="alter-table"/>. <literal>DROP
+      INDEX</literal> does not do anything prior to MySQL 3.22.
     </para>
 
     <remark role="help-description-end"/>

@@ -3514,9 +3521,9 @@
     <remark role="help-description-begin"/>
 
     <para>
-      <literal role="stmt">DROP TABLE</literal> removes one or more tables.
You must
-      have the <literal>DROP</literal> privilege for each table. All
-      table data and the table definition are
+      <literal role="stmt">DROP TABLE</literal> removes one or more
+      tables. You must have the <literal>DROP</literal> privilege for
+      each table. All table data and the table definition are
       <emphasis>removed</emphasis>, so <emphasis>be
careful</emphasis>
       with this statement! If any of the tables named in the argument
       list do not exist, MySQL returns an error indicating by name which

@@ -3548,9 +3555,9 @@
 
     <note>
       <para>
-        <literal role="stmt">DROP TABLE</literal> automatically commits the
current
-        active transaction, unless you are using MySQL 4.1 or higher and
-        the <literal>TEMPORARY</literal> keyword.
+        <literal role="stmt">DROP TABLE</literal> automatically commits
+        the current active transaction, unless you are using MySQL 4.1
+        or higher and the <literal>TEMPORARY</literal> keyword.
       </para>
     </note>
 


Modified: trunk/refman-4.1/sql-syntax-data-manipulation.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-data-manipulation.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/sql-syntax-data-manipulation.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 5, Lines Added: 27, Lines Deleted: 22; 4829 bytes

@@ -880,12 +880,13 @@
           column, and conversion of a given value can result in
           different inserted values depending on the data type. For
           example, inserting the string <literal>'1999.0e-2'</literal>
-          into an <literal role="type">INT</literal>,
<literal>FLOAT</literal>,
-          <literal>DECIMAL(10,6)</literal>, or
<literal>YEAR</literal>
-          column results in the values <literal>1999</literal>,
-          <literal>19.9921</literal>,
<literal>19.992100</literal>, and
-          <literal>1999</literal> being inserted, respectively. The
-          reason the value stored in the <literal role="type">INT</literal>
and
+          into an <literal role="type">INT</literal>,
+          <literal>FLOAT</literal>,
<literal>DECIMAL(10,6)</literal>, or
+          <literal>YEAR</literal> column results in the values
+          <literal>1999</literal>, <literal>19.9921</literal>,
+          <literal>19.992100</literal>, and
<literal>1999</literal>
+          being inserted, respectively. The reason the value stored in
+          the <literal role="type">INT</literal> and
           <literal>YEAR</literal> columns is
<literal>1999</literal> is
           that the string-to-integer conversion looks only at as much of
           the initial part of the string as may be considered a valid

@@ -1473,8 +1474,9 @@
         <listitem>
           <para>
             Pending <literal>INSERT DELAYED</literal> statements are
-            lost if a table is write locked and <literal role="stmt">ALTER
-            TABLE</literal> is used to modify the table structure.
+            lost if a table is write locked and
+            <literal role="stmt">ALTER TABLE</literal> is used to modify
+            the table structure.
           </para>
         </listitem>
 

@@ -1511,10 +1513,10 @@
             the handler thread to do so. The <literal>DELAYED</literal>
             lock can be obtained even if other threads have a
             <literal>READ</literal> or <literal>WRITE</literal>
lock on
-            the table. However, the handler waits for all <literal
role="stmt">ALTER
-            TABLE</literal> locks or <literal>FLUSH TABLES</literal>
-            statements to finish, to ensure that the table structure is
-            up to date.
+            the table. However, the handler waits for all
+            <literal role="stmt">ALTER TABLE</literal> locks or
+            <literal>FLUSH TABLES</literal> statements to finish, to
+            ensure that the table structure is up to date.
           </para>
         </listitem>
 

@@ -2654,11 +2656,13 @@
           fields (but you can still have a line terminator). Instead,
           column values are read and written using a field width wide
           enough to hold all values in the field. For
-          <literal role="type">TINYINT</literal>, <literal
role="type">SMALLINT</literal>,
-          <literal role="type">MEDIUMINT</literal>, <literal
role="type">INT</literal>, and
-          <literal role="type">BIGINT</literal>, the field widths are 4, 6,
8, 11,
-          and 20, respectively, no matter what the declared display
-          width is.
+          <literal role="type">TINYINT</literal>,
+          <literal role="type">SMALLINT</literal>,
+          <literal role="type">MEDIUMINT</literal>,
+          <literal role="type">INT</literal>, and
+          <literal role="type">BIGINT</literal>, the field widths are 4,
+          6, 8, 11, and 20, respectively, no matter what the declared
+          display width is.
         </para>
 
         <para>

@@ -5009,11 +5013,12 @@
         The subquery in this <literal>SELECT</literal> returns a single
         value (<literal>'abcde'</literal>) that has a data type of
         <literal>CHAR</literal>, a length of 5, a character set and
-        collation equal to the defaults in effect at <literal role="stmt">CREATE
-        TABLE</literal> time, and an indication that the value in the
-        column can be <literal>NULL</literal>. In fact, almost all
-        subqueries can be <literal>NULL</literal>. If the table used in
-        the example were empty, the value of the subquery would be
+        collation equal to the defaults in effect at
+        <literal role="stmt">CREATE TABLE</literal> time, and an
+        indication that the value in the column can be
+        <literal>NULL</literal>. In fact, almost all subqueries can be
+        <literal>NULL</literal>. If the table used in the example were
+        empty, the value of the subquery would be
         <literal>NULL</literal>.
       </para>
 


Modified: trunk/refman-4.1/sql-syntax-prepared-statements.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-prepared-statements.xml	2008-10-29 20:09:05 UTC (rev
12195)
+++ trunk/refman-4.1/sql-syntax-prepared-statements.xml	2008-10-29 20:10:08 UTC (rev
12196)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 2; 922 bytes

@@ -273,8 +273,9 @@
 
   <para>
     The following SQL statements can be used in prepared statements:
-    <literal role="stmt">ALTER TABLE</literal>,
<literal>COMMIT</literal>,
-    <literal>CREATE INDEX</literal>, <literal role="stmt">CREATE
TABLE</literal>,
+    <literal role="stmt">ALTER TABLE</literal>,
+    <literal>COMMIT</literal>, <literal>CREATE INDEX</literal>,
+    <literal role="stmt">CREATE TABLE</literal>,
     <literal>DELETE</literal>, <literal>DO</literal>,
<literal>DROP
     INDEX</literal>, <literal role="stmt">DROP TABLE</literal>,
     <literal>INSERT</literal>, <literal>RENAME TABLE</literal>,


Modified: trunk/refman-4.1/sql-syntax-replication.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-replication.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/sql-syntax-replication.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 1, Lines Added: 7, Lines Deleted: 7; 1444 bytes

@@ -1081,13 +1081,13 @@
         The <literal>UNTIL</literal> clause can be useful for debugging
         replication, or to cause replication to proceed until just
         before the point where you want to avoid having the slave
-        replicate a statement. For example, if an unwise <literal role="stmt">DROP
-        TABLE</literal> statement was executed on the master, you can
-        use <literal>UNTIL</literal> to tell the slave to execute up to
-        that point but no farther. To find what the event is, use
-        <command>mysqlbinlog</command> with the master logs or slave
-        relay logs, or by using a <literal>SHOW BINLOG EVENTS</literal>
-        statement.
+        replicate a statement. For example, if an unwise
+        <literal role="stmt">DROP TABLE</literal> statement was executed
+        on the master, you can use <literal>UNTIL</literal> to tell the
+        slave to execute up to that point but no farther. To find what
+        the event is, use <command>mysqlbinlog</command> with the master
+        logs or slave relay logs, or by using a <literal>SHOW BINLOG
+        EVENTS</literal> statement.
       </para>
 
       <para>


Modified: trunk/refman-4.1/sql-syntax-server-administration.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-server-administration.xml	2008-10-29 20:09:05 UTC (rev
12195)
+++ trunk/refman-4.1/sql-syntax-server-administration.xml	2008-10-29 20:10:08 UTC (rev
12196)
Changed blocks: 11, Lines Added: 38, Lines Deleted: 36; 7239 bytes

@@ -1964,11 +1964,11 @@
           <para>
             This is not an error in itself, but could cause trouble if
             you decide to dump the table and restore it or do an
-            <literal role="stmt">ALTER TABLE</literal> on the table. In this
case,
-            the <literal>AUTO_INCREMENT</literal> column changes value
-            according to the rules of <literal>AUTO_INCREMENT</literal>
-            columns, which could cause problems such as a duplicate-key
-            error.
+            <literal role="stmt">ALTER TABLE</literal> on the table. In
+            this case, the <literal>AUTO_INCREMENT</literal> column
+            changes value according to the rules of
+            <literal>AUTO_INCREMENT</literal> columns, which could cause
+            problems such as a duplicate-key error.
           </para>
 
           <para>

@@ -2165,9 +2165,9 @@
       <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 role="stmt">ALTER
TABLE</literal>,
-        which rebuilds the table to update index statistics and free
-        unused space in the clustered index.
+        TABLE</literal> is mapped to <literal role="stmt">ALTER
+        TABLE</literal>, which rebuilds the table to update index
+        statistics and free unused space in the clustered index.
       </para>
 
       <para>

@@ -3660,9 +3660,9 @@
 
       <para>
         If the data types differ from what you expect them to be based
-        on a <literal role="stmt">CREATE TABLE</literal> statement, note that
MySQL
-        sometimes changes data types when you create or alter a table.
-        The conditions under which this occurs are described in
+        on a <literal role="stmt">CREATE TABLE</literal> statement, note
+        that MySQL sometimes changes data types when you create or alter
+        a table. The conditions under which this occurs are described in
         <xref linkend="silent-column-changes"/>.
       </para>
 

@@ -3911,8 +3911,8 @@
       <remark role="help-description-begin"/>
 
       <para>
-        Shows the <literal role="stmt">CREATE TABLE</literal> statement that
creates
-        the given table. It was added in MySQL 3.23.20.
+        Shows the <literal role="stmt">CREATE TABLE</literal> statement
+        that creates the given table. It was added in MySQL 3.23.20.
       </para>
 
       <remark role="help-description-end"/>

@@ -4151,9 +4151,10 @@
             <literal>NdbTransaction</literal>: The number and size of
             <literal>NdbTransaction</literal> objects that have been
             created. An <literal>NdbTransaction</literal> is created
-            each time a table schema operation (such as <literal role="stmt">CREATE
-            TABLE</literal> or <literal role="stmt">ALTER
TABLE</literal>) is
-            performed on an <literal>NDB</literal> table.
+            each time a table schema operation (such as
+            <literal role="stmt">CREATE TABLE</literal> or
+            <literal role="stmt">ALTER TABLE</literal>) is performed on
+            an <literal>NDB</literal> table.
           </para>
         </listitem>
 

@@ -5707,9 +5708,10 @@
           <para>
             The message indicates that the table <literal>z</literal>
             existed on the master and was dropped there, but it did not
-            exist on the slave, so <literal role="stmt">DROP TABLE</literal>
failed
-            on the slave. (This might occur, for example, if you forget
-            to copy the table to the slave when setting up replication.)
+            exist on the slave, so <literal role="stmt">DROP
+            TABLE</literal> failed on the slave. (This might occur, for
+            example, if you forget to copy the table to the slave when
+            setting up replication.)
           </para>
         </listitem>
 

@@ -6316,11 +6318,11 @@
           </para>
 
           <para>
-            Extra options used with <literal role="stmt">CREATE
TABLE</literal>. The
-            original options supplied when <literal role="stmt">CREATE
-            TABLE</literal> is called are retained and the options
-            reported here may differ from the active table settings and
-            options.
+            Extra options used with <literal role="stmt">CREATE
+            TABLE</literal>. The original options supplied when
+            <literal role="stmt">CREATE TABLE</literal> is called are
+            retained and the options reported here may differ from the
+            active table settings and options.
           </para>
         </listitem>
 

@@ -6648,13 +6650,13 @@
         4.1.1, the situation is much improved, with warnings generated
         for statements such as <literal>LOAD DATA INFILE</literal> and
         DML statements such as <literal>INSERT</literal>,
-        <literal>UPDATE</literal>, <literal role="stmt">CREATE
TABLE</literal>, and
-        <literal role="stmt">ALTER TABLE</literal>.
+        <literal>UPDATE</literal>, <literal role="stmt">CREATE
+        TABLE</literal>, and <literal role="stmt">ALTER
TABLE</literal>.
       </para>
 
       <para>
-        The following <literal role="stmt">DROP TABLE</literal> statement
results in
-        a note:
+        The following <literal role="stmt">DROP TABLE</literal>
+        statement results in a note:
       </para>
 
 <programlisting>

@@ -6669,8 +6671,8 @@
 
       <para>
         Here is a simple example that shows a syntax warning for
-        <literal role="stmt">CREATE TABLE</literal> and conversion warnings
for
-        <literal>INSERT</literal>:
+        <literal role="stmt">CREATE TABLE</literal> and conversion
+        warnings for <literal>INSERT</literal>:
       </para>
 
 <programlisting>

@@ -6715,8 +6717,8 @@
         variable. By default, its value is 64. To change the number of
         messages you want stored, change the value of
         <literal>max_error_count</literal>. In the following example,
-        the <literal role="stmt">ALTER TABLE</literal> statement produces
three
-        warning messages, but only one is stored because
+        the <literal role="stmt">ALTER TABLE</literal> statement
+        produces three warning messages, but only one is stored because
         <literal>max_error_count</literal> has been set to 1:
       </para>
 

@@ -7282,10 +7284,10 @@
 
         <listitem>
           <para>
-            During <literal role="stmt">ALTER TABLE</literal>, the kill flag
is
-            checked before each block of rows are read from the original
-            table. If the kill flag was set, the statement is aborted
-            and the temporary table is deleted.
+            During <literal role="stmt">ALTER TABLE</literal>, the kill
+            flag is checked before each block of rows are read from the
+            original table. If the kill flag was set, the statement is
+            aborted and the temporary table is deleted.
           </para>
         </listitem>
 


Modified: trunk/refman-4.1/sql-syntax-transactions.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-transactions.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/sql-syntax-transactions.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 3, Lines Added: 29, Lines Deleted: 24; 4719 bytes

@@ -277,19 +277,21 @@
           <emphasis role="bold">Data definition language (DDL)
           statements that define or modify database objects.</emphasis>
           <literal role="stmt">ALTER TABLE</literal>, <literal>CREATE
-          INDEX</literal>, <literal>DROP INDEX</literal>, <literal
role="stmt">DROP
-          TABLE</literal>, <literal>RENAME TABLE</literal>.
+          INDEX</literal>, <literal>DROP INDEX</literal>,
+          <literal role="stmt">DROP TABLE</literal>, <literal>RENAME
+          TABLE</literal>.
         </para>
 
         <para>
-          <literal role="stmt">ALTER TABLE</literal>, <literal
role="stmt">CREATE
-          TABLE</literal>, and <literal role="stmt">DROP
TABLE</literal> do not
-          commit a transaction if the <literal>TEMPORARY</literal>
-          keyword is used. (This does not apply to other operations on
-          temporary tables such as <literal>CREATE INDEX</literal>,
-          which do cause a commit.) However, although no implicit commit
-          occurs, neither can the statement be rolled back. Therefore,
-          use of such statements will violate transaction atomicity: For
+          <literal role="stmt">ALTER TABLE</literal>,
+          <literal role="stmt">CREATE TABLE</literal>, and
+          <literal role="stmt">DROP TABLE</literal> do not commit a
+          transaction if the <literal>TEMPORARY</literal> keyword is
+          used. (This does not apply to other operations on temporary
+          tables such as <literal>CREATE INDEX</literal>, which do cause
+          a commit.) However, although no implicit commit occurs,
+          neither can the statement be rolled back. Therefore, use of
+          such statements will violate transaction atomicity: For
           example, if you use <literal>CREATE TEMPORARY TABLE</literal>
           and then roll back the transaction, the table remains in
           existence.

@@ -299,17 +301,19 @@
           The <literal role="stmt">CREATE TABLE</literal> statement in
           <literal>InnoDB</literal> is processed as a single
           transaction. This means that a <literal>ROLLBACK</literal>
-          from the user does not undo <literal role="stmt">CREATE
TABLE</literal>
-          statements the user made during that transaction.
+          from the user does not undo <literal role="stmt">CREATE
+          TABLE</literal> statements the user made during that
+          transaction.
         </para>
 
         <para>
-          Prior to MySQL 4.0.13, <literal role="stmt">CREATE TABLE</literal>
commits
-          a transaction if the binary update log is enabled. The
-          <literal role="stmt">CREATE TABLE</literal>, <literal>CREATE
-          DATABASE</literal> <literal>DROP DATABASE</literal>, and
-          <literal>TRUNCATE TABLE</literal> statements cause an implicit
-          commit beginning with MySQL 4.1.13.
+          Prior to MySQL 4.0.13, <literal role="stmt">CREATE
+          TABLE</literal> commits a transaction if the binary update log
+          is enabled. The <literal role="stmt">CREATE TABLE</literal>,
+          <literal>CREATE DATABASE</literal> <literal>DROP
+          DATABASE</literal>, and <literal>TRUNCATE TABLE</literal>
+          statements cause an implicit commit beginning with MySQL
+          4.1.13.
         </para>
       </listitem>
 

@@ -592,18 +596,19 @@
 
     <note>
       <para>
-        If you use <literal role="stmt">ALTER TABLE</literal> on a locked
table, it
-        may become unlocked. See <xref linkend="alter-table-problems"/>.
+        If you use <literal role="stmt">ALTER TABLE</literal> on a
+        locked table, it may become unlocked. See
+        <xref linkend="alter-table-problems"/>.
       </para>
     </note>
 
     <para>
       A table lock protects only against inappropriate reads or writes
       by other clients. The client holding the lock, even a read lock,
-      can perform table-level operations such as <literal role="stmt">DROP
-      TABLE</literal>. Truncate operations are not transaction-safe, so
-      an error occurs if the client attempts one during an active
-      transaction or while holding a table lock.
+      can perform table-level operations such as
+      <literal role="stmt">DROP TABLE</literal>. Truncate operations are
+      not transaction-safe, so an error occurs if the client attempts
+      one during an active transaction or while holding a table lock.
     </para>
 
     <remark role="help-description-end"/>


Modified: trunk/refman-4.1/sql-syntax-utility.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-utility.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/sql-syntax-utility.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 5; 1275 bytes

@@ -74,9 +74,9 @@
 
     <para>
       If the data types differ from what you expect them to be based on
-      a <literal role="stmt">CREATE TABLE</literal> statement, note that
MySQL
-      sometimes changes data types when you create or alter a table. The
-      conditions under which this occurs are described in
+      a <literal role="stmt">CREATE TABLE</literal> statement, note that
+      MySQL sometimes changes data types when you create or alter a
+      table. The conditions under which this occurs are described in
       <xref linkend="silent-column-changes"/>.
     </para>
 

@@ -257,8 +257,8 @@
         <para>
           For help on a specific help topic, such as the
           <literal role="func">ASCII()</literal> function or the
-          <literal role="stmt">CREATE TABLE</literal> statement, use the
associated
-          keyword or keywords:
+          <literal role="stmt">CREATE TABLE</literal> statement, use the
+          associated keyword or keywords:
         </para>
 
 <programlisting>


Modified: trunk/refman-4.1/storage-engines.xml
===================================================================
--- trunk/refman-4.1/storage-engines.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/storage-engines.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 9, Lines Added: 45, Lines Deleted: 42; 7596 bytes

@@ -188,8 +188,8 @@
   <para>
     When you create a new table, you can specify which storage engine to
     use by adding an <literal>ENGINE</literal> or
-    <literal>TYPE</literal> table option to the <literal
role="stmt">CREATE
-    TABLE</literal> statement:
+    <literal>TYPE</literal> table option to the
+    <literal role="stmt">CREATE TABLE</literal> statement:
   </para>
 
 <programlisting>

@@ -244,8 +244,8 @@
 
   <para>
     To convert a table from one storage engine to another, use an
-    <literal role="stmt">ALTER TABLE</literal> statement that indicates the
new
-    engine:
+    <literal role="stmt">ALTER TABLE</literal> statement that indicates
+    the new engine:
   </para>
 
 <programlisting>

@@ -582,8 +582,9 @@
           You can put the data file and index file in different
           directories on different physical devices to get more speed
           with the <literal>DATA DIRECTORY</literal> and <literal>INDEX
-          DIRECTORY</literal> table options to <literal role="stmt">CREATE
-          TABLE</literal>. See <xref linkend="create-table"/>.
+          DIRECTORY</literal> table options to
+          <literal role="stmt">CREATE TABLE</literal>. See
+          <xref linkend="create-table"/>.
         </para>
       </listitem>
 

@@ -818,11 +819,12 @@
           <para>
             The maximum size of the temporary file that MySQL is allowed
             to use while re-creating a <literal>MyISAM</literal> index
-            (during <literal>REPAIR TABLE</literal>, <literal
role="stmt">ALTER
-            TABLE</literal>, or <literal>LOAD DATA INFILE</literal>).
If
-            the file size would be larger than this value, the index is
-            created using the key cache instead, which is slower. This
-            variable was added in MySQL 3.23.37.
+            (during <literal>REPAIR TABLE</literal>,
+            <literal role="stmt">ALTER TABLE</literal>, or
<literal>LOAD
+            DATA INFILE</literal>). If the file size would be larger
+            than this value, the index is created using the key cache
+            instead, which is slower. This variable was added in MySQL
+            3.23.37.
           </para>
 
           <note>

@@ -989,11 +991,12 @@
       </para>
 
       <para>
-        When you use <literal role="stmt">CREATE TABLE</literal> or
<literal role="stmt">ALTER
-        TABLE</literal> for a table that has no <literal>BLOB</literal>
-        or <literal>TEXT</literal> columns, you can force the table
-        format to <literal>FIXED</literal> or
<literal>DYNAMIC</literal>
-        with the <literal>ROW_FORMAT</literal> table option.
+        When you use <literal role="stmt">CREATE TABLE</literal> or
+        <literal role="stmt">ALTER TABLE</literal> for a table that has
+        no <literal>BLOB</literal> or <literal>TEXT</literal>
columns,
+        you can force the table format to <literal>FIXED</literal> or
+        <literal>DYNAMIC</literal> with the
+        <literal>ROW_FORMAT</literal> table option.
       </para>
 
       <para>

@@ -1316,11 +1319,11 @@
                 <para>
                   If values in an integer column have a small range, the
                   column is stored using the smallest possible type. For
-                  example, a <literal role="type">BIGINT</literal> column
(eight
-                  bytes) can be stored as a <literal
role="type">TINYINT</literal>
-                  column (one byte) if all its values are in the range
-                  from <literal>-128</literal> to
-                  <literal>127</literal>.
+                  example, a <literal role="type">BIGINT</literal>
+                  column (eight bytes) can be stored as a
+                  <literal role="type">TINYINT</literal> column (one
+                  byte) if all its values are in the range from
+                  <literal>-128</literal> to
<literal>127</literal>.
                 </para>
               </listitem>
 

@@ -2144,12 +2147,12 @@
 
         <listitem>
           <para>
-            If you use <literal role="stmt">ALTER TABLE</literal> to change a
-            <literal>MERGE</literal> table to another storage engine,
-            the mapping to the underlying tables is lost. Instead, the
-            rows from the underlying <literal>MyISAM</literal> tables
-            are copied into the altered table, which then uses the
-            specified storage engine.
+            If you use <literal role="stmt">ALTER TABLE</literal> to
+            change a <literal>MERGE</literal> table to another storage
+            engine, the mapping to the underlying tables is lost.
+            Instead, the rows from the underlying
+            <literal>MyISAM</literal> tables are copied into the altered
+            table, which then uses the specified storage engine.
           </para>
         </listitem>
 

@@ -2231,13 +2234,13 @@
 
         <listitem>
           <para>
-            <literal role="stmt">DROP TABLE</literal> on a table that is in
use by a
-            <literal>MERGE</literal> table does not work on Windows
-            because the <literal>MERGE</literal> storage engine's table
-            mapping is hidden from the upper layer of MySQL. Windows
-            does not allow open files to be deleted, so you first must
-            flush all <literal>MERGE</literal> tables (with
-            <literal>FLUSH TABLES</literal>) or drop the
+            <literal role="stmt">DROP TABLE</literal> on a table that is
+            in use by a <literal>MERGE</literal> table does not work on
+            Windows because the <literal>MERGE</literal> storage
+            engine's table mapping is hidden from the upper layer of
+            MySQL. Windows does not allow open files to be deleted, so
+            you first must flush all <literal>MERGE</literal> tables
+            (with <literal>FLUSH TABLES</literal>) or drop the
             <literal>MERGE</literal> table before dropping the table.
           </para>
         </listitem>

@@ -2368,14 +2371,14 @@
             and its underlying tables should be the same. If you use
             <literal role="stmt">ALTER TABLE</literal> to add a
             <literal>UNIQUE</literal> index to a table used in a
-            <literal>MERGE</literal> table, and then use <literal
role="stmt">ALTER
-            TABLE</literal> to add a non-unique index on the
-            <literal>MERGE</literal> table, the index ordering is
-            different for the tables if there was already a non-unique
-            index in the underlying table. (This happens because
-            <literal role="stmt">ALTER TABLE</literal> puts
-            <literal>UNIQUE</literal> indexes before non-unique indexes
-            to facilitate rapid detection of duplicate keys.)
+            <literal>MERGE</literal> table, and then use
+            <literal role="stmt">ALTER TABLE</literal> to add a
+            non-unique index on the <literal>MERGE</literal> table, the
+            index ordering is different for the tables if there was
+            already a non-unique index in the underlying table. (This
+            happens because <literal role="stmt">ALTER TABLE</literal>
+            puts <literal>UNIQUE</literal> indexes before non-unique
+            indexes to facilitate rapid detection of duplicate keys.)
             Consequently, queries on tables with such indexes may return
             unexpected results.
           </para>


Modified: trunk/refman-4.1/tutorial.xml
===================================================================
--- trunk/refman-4.1/tutorial.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-4.1/tutorial.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 6, Lines Added: 22, Lines Deleted: 22; 4183 bytes

@@ -888,14 +888,13 @@
       </para>
 
       <para>
-        Use a <literal role="stmt">CREATE
-        TABLE</literal> statement to specify the
-        layout of your table:
+        Use a <literal role="stmt">CREATE TABLE</literal> statement to
+        specify the layout of your table:
       </para>
 
       <para>
-        Use a <literal role="stmt">CREATE TABLE</literal> statement to
specify the
-        layout of your table:
+        Use a <literal role="stmt">CREATE TABLE</literal> statement to
+        specify the layout of your table:
       </para>
 
 <programlisting>

@@ -912,8 +911,8 @@
         pick any length from <literal>1</literal> to
         <literal>255</literal>, whatever seems most reasonable to you.
         (If you make a poor choice and it turns out later that you need
-        a longer field, MySQL provides an <literal role="stmt">ALTER
TABLE</literal>
-        statement.)
+        a longer field, MySQL provides an <literal role="stmt">ALTER
+        TABLE</literal> statement.)
       </para>
 
       <para>

@@ -1109,13 +1108,13 @@
         You could create a text file <filename>pet.txt</filename>
         containing one record per line, with values separated by tabs,
         and given in the order in which the columns were listed in the
-        <literal role="stmt">CREATE TABLE</literal> statement. For missing
values
-        (such as unknown sexes or death dates for animals that are still
-        living), you can use <literal>NULL</literal> values. To
-        represent these in your text file, use <literal>\N</literal>
-        (backslash, capital-N). For example, the record for Whistler the
-        bird would look like this (where the whitespace between values
-        is a single tab character):
+        <literal role="stmt">CREATE TABLE</literal> statement. For
+        missing values (such as unknown sexes or death dates for animals
+        that are still living), you can use <literal>NULL</literal>
+        values. To represent these in your text file, use
+        <literal>\N</literal> (backslash, capital-N). For example, the
+        record for Whistler the bird would look like this (where the
+        whitespace between values is a single tab character):
       </para>
 
 <programlisting>

@@ -1166,10 +1165,10 @@
         When you want to add new records one at a time, the
         <literal>INSERT</literal> statement is useful. In its simplest
         form, you supply values for each column, in the order in which
-        the columns were listed in the <literal role="stmt">CREATE
TABLE</literal>
-        statement. Suppose that Diane gets a new hamster named
-        <quote>Puffball.</quote> You could add a new record using an
-        <literal>INSERT</literal> statement like this:
+        the columns were listed in the <literal role="stmt">CREATE
+        TABLE</literal> statement. Suppose that Diane gets a new hamster
+        named <quote>Puffball.</quote> You could add a new record using
+        an <literal>INSERT</literal> statement like this:
       </para>
 
 <programlisting>

@@ -2912,9 +2911,9 @@
     </para>
 
     <para>
-      You can obtain the <literal role="stmt">CREATE TABLE</literal>
statement
-      necessary to create an existing table using the <literal>SHOW
-      CREATE TABLE</literal> statement. See
+      You can obtain the <literal role="stmt">CREATE TABLE</literal>
+      statement necessary to create an existing table using the
+      <literal>SHOW CREATE TABLE</literal> statement. See
       <xref linkend="show-create-table"/>.
     </para>
 

@@ -4011,7 +4010,8 @@
       <para>
         To start with an <literal>AUTO_INCREMENT</literal> value other
         than 1, you can set that value with <literal role="stmt">CREATE
-        TABLE</literal> or <literal role="stmt">ALTER TABLE</literal>,
like this:
+        TABLE</literal> or <literal role="stmt">ALTER TABLE</literal>,
+        like this:
 
 <programlisting>
 mysql&gt; <userinput>ALTER TABLE tbl AUTO_INCREMENT = 100;</userinput>


Modified: trunk/refman-5.0/apis-c.xml
===================================================================
--- trunk/refman-5.0/apis-c.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-5.0/apis-c.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 2, Lines Added: 15, Lines Deleted: 13; 2251 bytes

@@ -8534,12 +8534,13 @@
 
     <para>
       The following statements can be used as prepared statements:
-      <literal role="stmt">CREATE TABLE</literal>,
<literal>DELETE</literal>,
-      <literal>DO</literal>, <literal>INSERT</literal>,
-      <literal>REPLACE</literal>, <literal>SELECT</literal>,
-      <literal>SET</literal>, <literal>UPDATE</literal>, and most
-      <literal>SHOW</literal> statements. Other statements are not
-      supported in MySQL &current-series;.
+      <literal role="stmt">CREATE TABLE</literal>,
+      <literal>DELETE</literal>, <literal>DO</literal>,
+      <literal>INSERT</literal>, <literal>REPLACE</literal>,
+      <literal>SELECT</literal>, <literal>SET</literal>,
+      <literal>UPDATE</literal>, and most <literal>SHOW</literal>
+      statements. Other statements are not supported in MySQL
+      &current-series;.
     </para>
 
     <formalpara role="mnmas-kb">

@@ -9338,13 +9339,14 @@
 
       <listitem>
         <para>
-          If you fetch an SQL <literal role="type">MEDIUMINT</literal> column
value,
-          but specify a <literal>buffer_type</literal> value of
-          <literal>MYSQL_TYPE_LONGLONG</literal> and use a C variable of
-          type <literal>long long int</literal> as the destination
-          buffer, MySQL will convert the <literal
role="type">MEDIUMINT</literal>
-          value (which requires less than 8 bytes) for storage into the
-          <literal>long long int</literal> (an 8-byte variable).
+          If you fetch an SQL <literal role="type">MEDIUMINT</literal>
+          column value, but specify a <literal>buffer_type</literal>
+          value of <literal>MYSQL_TYPE_LONGLONG</literal> and use a C
+          variable of type <literal>long long int</literal> as the
+          destination buffer, MySQL will convert the
+          <literal role="type">MEDIUMINT</literal> value (which requires
+          less than 8 bytes) for storage into the <literal>long long
+          int</literal> (an 8-byte variable).
         </para>
       </listitem>
 


Modified: trunk/refman-5.0/backup.xml
===================================================================
--- trunk/refman-5.0/backup.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-5.0/backup.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 2, Lines Added: 5, Lines Deleted: 4; 1451 bytes

@@ -93,8 +93,8 @@
         <emphasis role="bold">Logical versus physical (raw)
         backups.</emphasis> Logical backups save information represented
         as logical database structure (<literal>CREATE
-        DATABASE</literal>, <literal role="stmt">CREATE TABLE</literal>
statements)
-        and content (<literal>INSERT</literal> statements or
+        DATABASE</literal>, <literal role="stmt">CREATE TABLE</literal>
+        statements) and content (<literal>INSERT</literal> statements or
         delimited-text files). Physical backups consist of raw copies of
         the directories and files that store database contents.
       </para>

@@ -1786,8 +1786,9 @@
       <para>
         Note that error 135 (no more room in record file) and error 136
         (no more room in index file) are not errors that can be fixed by
-        a simple repair. In this case, you must use <literal role="stmt">ALTER
-        TABLE</literal> to increase the <literal>MAX_ROWS</literal> and
+        a simple repair. In this case, you must use
+        <literal role="stmt">ALTER TABLE</literal> to increase the
+        <literal>MAX_ROWS</literal> and
         <literal>AVG_ROW_LENGTH</literal> table option values:
       </para>
 


Modified: trunk/refman-5.0/data-types.xml
===================================================================
--- trunk/refman-5.0/data-types.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-5.0/data-types.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 14, Lines Added: 57, Lines Deleted: 50; 10249 bytes

@@ -481,7 +481,8 @@
           </para>
 
           <para>
-            This type is a synonym for <literal role="type">INT</literal>.
+            This type is a synonym for
+            <literal role="type">INT</literal>.
           </para>
 
           <remark role="help-description-end"/>

@@ -543,19 +544,20 @@
                 </indexterm>
 
                 All arithmetic is done using signed
-                <literal role="type">BIGINT</literal> or
<literal>DOUBLE</literal>
-                values, so you should not use unsigned big integers
-                larger than <literal>9223372036854775807</literal> (63
-                bits) except with bit functions! If you do that, some of
-                the last digits in the result may be wrong because of
-                rounding errors when converting a
+                <literal role="type">BIGINT</literal> or
+                <literal>DOUBLE</literal> values, so you should not use
+                unsigned big integers larger than
+                <literal>9223372036854775807</literal> (63 bits) except
+                with bit functions! If you do that, some of the last
+                digits in the result may be wrong because of rounding
+                errors when converting a
                 <literal role="type">BIGINT</literal> value to a
                 <literal>DOUBLE</literal>.
               </para>
 
               <para>
-                MySQL can handle <literal role="type">BIGINT</literal> in the
-                following cases:
+                MySQL can handle <literal role="type">BIGINT</literal>
+                in the following cases:
               </para>
 
               <itemizedlist>

@@ -594,10 +596,10 @@
             <listitem>
               <para>
                 You can always store an exact integer value in a
-                <literal role="type">BIGINT</literal> column by storing it
using a
-                string. In this case, MySQL performs a string-to-number
-                conversion that involves no intermediate
-                double-precision representation.
+                <literal role="type">BIGINT</literal> column by storing
+                it using a string. In this case, MySQL performs a
+                string-to-number conversion that involves no
+                intermediate double-precision representation.
               </para>
             </listitem>
 

@@ -606,11 +608,11 @@
                 The <literal role="op" condition="minus">-</literal>,
                 <literal role="op" condition="plus">+</literal>, and
                 <literal role="op" condition="times">*</literal>
-                operators use <literal role="type">BIGINT</literal>
arithmetic when
-                both operands are integer values. This means that if you
-                multiply two big integers (or results from functions
-                that return integers), you may get unexpected results
-                when the result is larger than
+                operators use <literal role="type">BIGINT</literal>
+                arithmetic when both operands are integer values. This
+                means that if you multiply two big integers (or results
+                from functions that return integers), you may get
+                unexpected results when the result is larger than
                 <literal>9223372036854775807</literal>.
               </para>
             </listitem>

@@ -1253,9 +1255,9 @@
 
       <para>
         In some cases, MySQL may change a string column to a type
-        different from that given in a <literal role="stmt">CREATE
TABLE</literal>
-        or <literal role="stmt">ALTER TABLE</literal> statement. See
-        <xref linkend="silent-column-changes"/>.
+        different from that given in a <literal role="stmt">CREATE
+        TABLE</literal> or <literal role="stmt">ALTER TABLE</literal>
+        statement. See <xref linkend="silent-column-changes"/>.
       </para>
 
       <para>

@@ -2280,7 +2282,8 @@
     <para>
       MySQL supports all of the standard SQL numeric data types. These
       types include the exact numeric data types
-      (<literal>INTEGER</literal>, <literal
role="type">SMALLINT</literal>,
+      (<literal>INTEGER</literal>,
+      <literal role="type">SMALLINT</literal>,
       <literal>DECIMAL</literal>, and
<literal>NUMERIC</literal>), as
       well as the approximate numeric data types
       (<literal>FLOAT</literal>, <literal>REAL</literal>, and

@@ -2312,9 +2315,9 @@
     <para>
       As an extension to the SQL standard, MySQL also supports the
       integer types <literal role="type">TINYINT</literal>,
-      <literal role="type">MEDIUMINT</literal>, and <literal
role="type">BIGINT</literal>. The
-      following table shows the required storage and range for each of
-      the integer types.
+      <literal role="type">MEDIUMINT</literal>, and
+      <literal role="type">BIGINT</literal>. The following table shows
+      the required storage and range for each of the integer types.
     </para>
 
     <informaltable>

@@ -2415,9 +2418,10 @@
       of digits that are displayed for values having a width exceeding
       that specified for the column. For example, a column specified as
       <literal>SMALLINT(3)</literal> has the usual
-      <literal role="type">SMALLINT</literal> range of
<literal>-32768</literal> to
-      <literal>32767</literal>, and values outside the range allowed by
-      three characters are displayed using more than three characters.
+      <literal role="type">SMALLINT</literal> range of
+      <literal>-32768</literal> to <literal>32767</literal>, and
values
+      outside the range allowed by three characters are displayed using
+      more than three characters.
     </para>
 
     <para>

@@ -2446,10 +2450,10 @@
       <literal>UNSIGNED</literal>. Unsigned values can be used when you
       want to allow only non-negative numbers in a column and you need a
       larger upper numeric range for the column. For example, if an
-      <literal role="type">INT</literal> column is
<literal>UNSIGNED</literal>, the
-      size of the column's range is the same but its endpoints shift
-      from <literal>-2147483648</literal> and
-      <literal>2147483647</literal> up to <literal>0</literal>
and
+      <literal role="type">INT</literal> column is
+      <literal>UNSIGNED</literal>, the size of the column's range is the
+      same but its endpoints shift from <literal>-2147483648</literal>
+      and <literal>2147483647</literal> up to
<literal>0</literal> and
       <literal>4294967295</literal>.
     </para>
 

@@ -2658,12 +2662,12 @@
       In non-strict mode, when an out-of-range value is assigned to an
       integer column, MySQL stores the value representing the
       corresponding endpoint of the column data type range. If you store
-      256 into a <literal role="type">TINYINT</literal> or
<literal>TINYINT
-      UNSIGNED</literal> column, MySQL stores 127 or 255, respectively.
-      When a floating-point or fixed-point column is assigned a value
-      that exceeds the range implied by the specified (or default)
-      precision and scale, MySQL stores the value representing the
-      corresponding endpoint of that range.
+      256 into a <literal role="type">TINYINT</literal> or
+      <literal>TINYINT UNSIGNED</literal> column, MySQL stores 127 or
+      255, respectively. When a floating-point or fixed-point column is
+      assigned a value that exceeds the range implied by the specified
+      (or default) precision and scale, MySQL stores the value
+      representing the corresponding endpoint of that range.
     </para>
 
     <para>

@@ -2704,9 +2708,9 @@
 
     <para>
       Conversions that occur due to clipping when MySQL is not operating
-      in strict mode are reported as warnings for <literal role="stmt">ALTER
-      TABLE</literal>, <literal>LOAD DATA INFILE</literal>,
-      <literal>UPDATE</literal>, and multiple-row
+      in strict mode are reported as warnings for
+      <literal role="stmt">ALTER TABLE</literal>, <literal>LOAD DATA
+      INFILE</literal>, <literal>UPDATE</literal>, and multiple-row
       <literal>INSERT</literal> statements. When MySQL is operating in
       strict mode, these statements fail, and some or all of the values
       will not be inserted or changed, depending on whether the table is

@@ -3433,9 +3437,9 @@
 
           <listitem>
             <para>
-              In a <literal role="stmt">CREATE TABLE</literal> statement, the
first
-              <literal>TIMESTAMP</literal> column can be declared in any
-              of the following ways:
+              In a <literal role="stmt">CREATE TABLE</literal>
+              statement, the first <literal>TIMESTAMP</literal> column
+              can be declared in any of the following ways:
             </para>
 
             <itemizedlist>

@@ -4909,8 +4913,9 @@
 </programlisting>
 
       <para>
-        However, this version of the previous <literal role="stmt">CREATE
-        TABLE</literal> statement does <emphasis>not</emphasis> work:
+        However, this version of the previous
+        <literal role="stmt">CREATE TABLE</literal> statement does
+        <emphasis>not</emphasis> work:
       </para>
 
 <programlisting>

@@ -5504,10 +5509,12 @@
         <literal>NDB</literal> table. This requirement applies in
         addition to any other considerations that are discussed in this
         section. For example, in <literal>NDBCLUSTER</literal> tables,
-        the <literal role="type">TINYINT</literal>, <literal
role="type">SMALLINT</literal>,
-        <literal role="type">MEDIUMINT</literal>, and
<literal>INTEGER</literal>
-        (<literal role="type">INT</literal>) column types each require 4
bytes
-        storage per record due to the alignment factor.
+        the <literal role="type">TINYINT</literal>,
+        <literal role="type">SMALLINT</literal>,
+        <literal role="type">MEDIUMINT</literal>, and
+        <literal>INTEGER</literal> (<literal
role="type">INT</literal>)
+        column types each require 4 bytes storage per record due to the
+        alignment factor.
       </para>
 
       <para>


Modified: trunk/refman-5.0/dba-core.xml
===================================================================
--- trunk/refman-5.0/dba-core.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-5.0/dba-core.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 12, Lines Added: 38, Lines Deleted: 35; 7543 bytes

@@ -1621,7 +1621,8 @@
           <para>
             Log slow administrative statements such as <literal>OPTIMIZE
             TABLE</literal>, <literal>ANALYZE TABLE</literal>, and
-            <literal role="stmt">ALTER TABLE</literal> to the slow query log.
+            <literal role="stmt">ALTER TABLE</literal> to the slow query
+            log.
           </para>
         </listitem>
 

@@ -2691,10 +2692,11 @@
                 a <literal>MyISAM</literal> index file or data file to
                 another directory with the <literal>INDEX
                 DIRECTORY</literal> or <literal>DATA
DIRECTORY</literal>
-                options of the <literal role="stmt">CREATE TABLE</literal>
-                statement. If you delete or rename the table, the files
-                that its symbolic links point to also are deleted or
-                renamed. See <xref linkend="symbolic-links-to-tables"/>.
+                options of the <literal role="stmt">CREATE
+                TABLE</literal> statement. If you delete or rename the
+                table, the files that its symbolic links point to also
+                are deleted or renamed. See
+                <xref linkend="symbolic-links-to-tables"/>.
               </para>
             </listitem>
 

@@ -4230,8 +4232,8 @@
             This option applies only to <literal>MyISAM</literal>
             tables. It can have one of the following values to affect
             handling of the <literal>DELAY_KEY_WRITE</literal> table
-            option that can be used in <literal role="stmt">CREATE
TABLE</literal>
-            statements.
+            option that can be used in <literal role="stmt">CREATE
+            TABLE</literal> statements.
           </para>
 
           <informaltable>

@@ -4250,8 +4252,8 @@
                 <row>
                   <entry><literal>ON</literal></entry>
                   <entry>MySQL honors any
<literal>DELAY_KEY_WRITE</literal> option specified in
-                    <literal role="stmt">CREATE TABLE</literal> statements.
This is
-                    the default value.</entry>
+                    <literal role="stmt">CREATE TABLE</literal>
+                    statements. This is the default value.</entry>
                 </row>
                 <row>
                   <entry><literal>ALL</literal></entry>

@@ -5703,12 +5705,13 @@
             <literal>MEMORY</literal> table
<literal>MAX_ROWS</literal>
             values. Setting this variable has no effect on any existing
             <literal>MEMORY</literal> table, unless the table is
-            re-created with a statement such as <literal role="stmt">CREATE
-            TABLE</literal> or altered with <literal role="stmt">ALTER
-            TABLE</literal> or <literal>TRUNCATE TABLE</literal>. A
-            server restart also sets the maximum size of existing
-            <literal>MEMORY</literal> tables to the global
-            <literal>max_heap_table_size</literal> value.
+            re-created with a statement such as
+            <literal role="stmt">CREATE TABLE</literal> or altered with
+            <literal role="stmt">ALTER TABLE</literal> or
+            <literal>TRUNCATE TABLE</literal>. A server restart also
+            sets the maximum size of existing <literal>MEMORY</literal>
+            tables to the global <literal>max_heap_table_size</literal>
+            value.
           </para>
 
           <formalpara role="mnmas">

@@ -6004,11 +6007,11 @@
           <para>
             The maximum size of the temporary file that MySQL is allowed
             to use while re-creating a <literal>MyISAM</literal> index
-            (during <literal>REPAIR TABLE</literal>, <literal
role="stmt">ALTER
-            TABLE</literal>, or <literal>LOAD DATA INFILE</literal>).
If
-            the file size would be larger than this value, the index is
-            created using the key cache instead, which is slower. The
-            value is given in bytes.
+            (during <literal>REPAIR TABLE</literal>,
+            <literal role="stmt">ALTER TABLE</literal>, or
<literal>LOAD
+            DATA INFILE</literal>). If the file size would be larger
+            than this value, the index is created using the key cache
+            instead, which is slower. The value is given in bytes.
           </para>
 
           <para>

@@ -6064,8 +6067,8 @@
             The size of the buffer that is allocated when sorting
             <literal>MyISAM</literal> indexes during a <literal>REPAIR
             TABLE</literal> or when creating indexes with
-            <literal>CREATE INDEX</literal> or <literal
role="stmt">ALTER
-            TABLE</literal>.
+            <literal>CREATE INDEX</literal> or
+            <literal role="stmt">ALTER TABLE</literal>.
           </para>
 
           <para>

@@ -7940,9 +7943,9 @@
             affects data definition statements: <literal>DROP
             DATABASE</literal> drops a database even if it contains
             tables that have foreign keys that are referred to by tables
-            outside the database, and <literal role="stmt">DROP
TABLE</literal>
-            drops tables that have foreign keys that are referred to by
-            other tables.
+            outside the database, and <literal role="stmt">DROP
+            TABLE</literal> drops tables that have foreign keys that are
+            referred to by other tables.
           </para>
 
           <note>

@@ -7979,8 +7982,8 @@
 
           <para>
             Set the value to be used by the following
-            <literal>INSERT</literal> or <literal role="stmt">ALTER
TABLE</literal>
-            statement when inserting an
+            <literal>INSERT</literal> or <literal role="stmt">ALTER
+            TABLE</literal> statement when inserting an
             <literal>AUTO_INCREMENT</literal> value. This is mainly used
             with the binary log.
           </para>

@@ -11063,10 +11066,10 @@
 
           <para>
             Control automatic substitution of the default storage engine
-            when a statement such as <literal role="stmt">CREATE
TABLE</literal> or
-            <literal role="stmt">ALTER TABLE</literal> specifies a storage
engine
-            that is disabled or not compiled in. (Implemented in MySQL
-            5.0.8)
+            when a statement such as <literal role="stmt">CREATE
+            TABLE</literal> or <literal role="stmt">ALTER
+            TABLE</literal> specifies a storage engine that is disabled
+            or not compiled in. (Implemented in MySQL 5.0.8)
           </para>
 
           <para>

@@ -12888,8 +12891,8 @@
         <option>--log-slow-admin-statements</option> server option
         enables you to request logging of slow administrative statements
         such as <literal>OPTIMIZE TABLE</literal>, <literal>ANALYZE
-        TABLE</literal>, and <literal role="stmt">ALTER TABLE</literal>
to the slow
-        query log.
+        TABLE</literal>, and <literal role="stmt">ALTER TABLE</literal>
+        to the slow query log.
       </para>
 
       <para>

@@ -15389,8 +15392,8 @@
 
       <para>
         The <literal>ALTER</literal> privilege enables you to use
-        <literal role="stmt">ALTER TABLE</literal> to change the structure of
or
-        rename tables.
+        <literal role="stmt">ALTER TABLE</literal> to change the
+        structure of or rename tables.
       </para>
 
       <formalpara role="mnmas">


Modified: trunk/refman-5.0/errors-problems.xml
===================================================================
--- trunk/refman-5.0/errors-problems.xml	2008-10-29 20:09:05 UTC (rev 12195)
+++ trunk/refman-5.0/errors-problems.xml	2008-10-29 20:10:08 UTC (rev 12196)
Changed blocks: 12, Lines Added: 58, Lines Deleted: 51; 10168 bytes

@@ -1808,8 +1808,9 @@
             <para>
               If you need a <literal>MyISAM</literal> table that is
               larger than the default limit and your operating system
-              supports large files, the <literal role="stmt">CREATE
TABLE</literal>
-              statement supports <literal>AVG_ROW_LENGTH</literal> and
+              supports large files, the <literal role="stmt">CREATE
+              TABLE</literal> statement supports
+              <literal>AVG_ROW_LENGTH</literal> and
               <literal>MAX_ROWS</literal> options. See
               <xref linkend="create-table"/>. The server uses these
               options to determine how large a table to allow.

@@ -3087,8 +3088,8 @@
               You have found a bug in the data storage code. This isn't
               likely, but it's at least possible. In this case, you can
               try to change the storage engine to another engine by
-              using <literal role="stmt">ALTER TABLE</literal> on a repaired
copy of
-              the table.
+              using <literal role="stmt">ALTER TABLE</literal> on a
+              repaired copy of the table.
             </para>
           </listitem>
 

@@ -3302,9 +3303,10 @@
               <literal>BLOB</literal> or <literal>TEXT</literal>
               columns), you can try to change all
               <literal>VARCHAR</literal> to
<literal>CHAR</literal> with
-              <literal role="stmt">ALTER TABLE</literal>. This forces MySQL
to use
-              fixed-size rows. Fixed-size rows take a little extra
-              space, but are much more tolerant to corruption.
+              <literal role="stmt">ALTER TABLE</literal>. This forces
+              MySQL to use fixed-size rows. Fixed-size rows take a
+              little extra space, but are much more tolerant to
+              corruption.
             </para>
 
             <para>

@@ -3416,13 +3418,14 @@
           <literal>REPAIR TABLE</literal> or <literal>OPTIMIZE
           TABLE</literal> or when the indexes are created in a batch
           after <literal>LOAD DATA INFILE</literal> or after an
-          <literal role="stmt">ALTER TABLE</literal> statement. All of these
-          statements may create large temporary files that, if left to
-          themselves, would cause big problems for the rest of the
-          system. If the disk becomes full while MySQL is doing any of
-          these operations, it removes the big temporary files and mark
-          the table as crashed. The exception is that for <literal
role="stmt">ALTER
-          TABLE</literal>, the old table is left unchanged.
+          <literal role="stmt">ALTER TABLE</literal> statement. All of
+          these statements may create large temporary files that, if
+          left to themselves, would cause big problems for the rest of
+          the system. If the disk becomes full while MySQL is doing any
+          of these operations, it removes the big temporary files and
+          mark the table as crashed. The exception is that for
+          <literal role="stmt">ALTER TABLE</literal>, the old table is
+          left unchanged.
         </para>
 
         <formalpara role="mnmas">

@@ -3534,8 +3537,8 @@
         </para>
 
         <para>
-          <literal role="stmt">ALTER TABLE</literal> creates a temporary
table in
-          the same directory as the original table.
+          <literal role="stmt">ALTER TABLE</literal> creates a temporary
+          table in the same directory as the original table.
         </para>
 
       </section>

@@ -4857,19 +4860,19 @@
         </indexterm>
 
         <para>
-          <literal role="stmt">ALTER TABLE</literal> changes a table to the
current
-          character set. If you get a duplicate-key error during
-          <literal role="stmt">ALTER TABLE</literal>, the cause is either
that the
-          new character sets maps two keys to the same value or that the
-          table is corrupted. In the latter case, you should run
-          <literal>REPAIR TABLE</literal> on the table.
+          <literal role="stmt">ALTER TABLE</literal> changes a table to
+          the current character set. If you get a duplicate-key error
+          during <literal role="stmt">ALTER TABLE</literal>, the cause
+          is either that the new character sets maps two keys to the
+          same value or that the table is corrupted. In the latter case,
+          you should run <literal>REPAIR TABLE</literal> on the table.
         </para>
 
         <para>
-          If <literal role="stmt">ALTER TABLE</literal> dies with the
following
-          error, the problem may be that MySQL crashed during an earlier
-          <literal role="stmt">ALTER TABLE</literal> operation and there is
an old
-          table named
+          If <literal role="stmt">ALTER TABLE</literal> dies with the
+          following error, the problem may be that MySQL crashed during
+          an earlier <literal role="stmt">ALTER TABLE</literal>
+          operation and there is an old table named
           <filename>A-<replaceable>xxx</replaceable></filename>
or
           <filename>B-<replaceable>xxx</replaceable></filename>
lying
           around:

@@ -4888,7 +4891,8 @@
         </para>
 
         <para>
-          <literal role="stmt">ALTER TABLE</literal> works in the following
way:
+          <literal role="stmt">ALTER TABLE</literal> works in the
+          following way:
         </para>
 
         <itemizedlist>

@@ -4943,12 +4947,12 @@
         </para>
 
         <para>
-          If you use <literal role="stmt">ALTER TABLE</literal> on a
transactional
-          table or if you are using Windows or OS/2, <literal role="stmt">ALTER
-          TABLE</literal> unlocks the table if you had done a
-          <literal>LOCK TABLE</literal> on it. This is done because
-          <literal>InnoDB</literal> and these operating systems cannot
-          drop a table that is in use.
+          If you use <literal role="stmt">ALTER TABLE</literal> on a
+          transactional table or if you are using Windows or OS/2,
+          <literal role="stmt">ALTER TABLE</literal> unlocks the table
+          if you had done a <literal>LOCK TABLE</literal> on it. This is
+          done because <literal>InnoDB</literal> and these operating
+          systems cannot drop a table that is in use.
         </para>
 
       </section>

@@ -5236,10 +5240,11 @@
               If one user has a long-running transaction and another
               user drops a table that is updated in the transaction,
               there is small chance that the binary log may contain the
-              <literal role="stmt">DROP TABLE</literal> command before the
table is
-              used in the transaction itself. We plan to fix this by
-              having the <literal role="stmt">DROP TABLE</literal> command
wait
-              until the table is not being used in any transaction.
+              <literal role="stmt">DROP TABLE</literal> command before
+              the table is used in the transaction itself. We plan to
+              fix this by having the <literal role="stmt">DROP
+              TABLE</literal> command wait until the table is not being
+              used in any transaction.
             </para>
           </listitem>
 

@@ -5278,8 +5283,8 @@
 
           <listitem>
             <para>
-              Don't execute <literal role="stmt">ALTER TABLE</literal> on a
-              <literal>BDB</literal> table on which you are running
+              Don't execute <literal role="stmt">ALTER TABLE</literal>
+              on a <literal>BDB</literal> table on which you are running
               multiple-statement transactions until all those
               transactions complete. (The transaction might be ignored.)
             </para>

@@ -5526,17 +5531,19 @@
           <listitem>
             <para>
               Numeric calculations are done with
-              <literal role="type">BIGINT</literal> or
<literal>DOUBLE</literal>
-              (both are normally 64 bits long). Which precision you get
-              depends on the function. The general rule is that bit
-              functions are performed with <literal
role="type">BIGINT</literal>
-              precision, <literal>IF</literal> and
+              <literal role="type">BIGINT</literal> or
+              <literal>DOUBLE</literal> (both are normally 64 bits
+              long). Which precision you get depends on the function.
+              The general rule is that bit functions are performed with
+              <literal role="type">BIGINT</literal> precision,
+              <literal>IF</literal> and
               <literal role="func">ELT()</literal> with
-              <literal role="type">BIGINT</literal> or
<literal>DOUBLE</literal>
-              precision, and the rest with <literal>DOUBLE</literal>
-              precision. You should try to avoid using unsigned long
-              long values if they resolve to be larger than 63 bits
-              (9223372036854775807) for anything other than bit fields.
+              <literal role="type">BIGINT</literal> or
+              <literal>DOUBLE</literal> precision, and the rest with
+              <literal>DOUBLE</literal> precision. You should try to
+              avoid using unsigned long long values if they resolve to
+              be larger than 63 bits (9223372036854775807) for anything
+              other than bit fields.
             </para>
           </listitem>
 

@@ -5671,8 +5678,8 @@
 
           <listitem>
             <para>
-              If you use <literal role="stmt">ALTER TABLE</literal> to add a
-              <literal>UNIQUE</literal> index to a table used in a
+              If you use <literal role="stmt">ALTER TABLE</literal> to
+              add a <literal>UNIQUE</literal> index to a table used in a
               <literal>MERGE</literal> table and then add a normal index
               on the <literal>MERGE</literal> table, the key order is
               different for the tables if there was an old,


Modified: trunk/refman-5.0/faqs.xml
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 102 bytes


Thread
svn commit - mysqldoc@docsrva: r12196 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.1-maria refman-6.0 refman-commonpaul.dubois29 Oct