List:Commits« Previous MessageNext Message »
From:paul.dubois Date:June 8 2011 7:36pm
Subject:svn commit - mysqldoc@oter02: r26459 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0
View as plain text  
Author: pd221994
Date: 2011-06-08 21:36:28 +0200 (Wed, 08 Jun 2011)
New Revision: 26459

Log:
 r48763@dhcp-adc-twvpn-1-vpnpool-10-154-0-199:  paul | 2011-06-08 13:38:05 -0500
 Turn a bridgehead into a subsection


Modified:
   svk:merge
   trunk/refman-5.0/sql-syntax-data-definition.xml
   trunk/refman-5.1/sql-syntax-data-definition.xml
   trunk/refman-5.5/sql-syntax-data-definition.xml
   trunk/refman-5.6/sql-syntax-data-definition.xml
   trunk/refman-6.0/sql-syntax-data-definition.xml

Property changes on: trunk
___________________________________________________________________

Modified: svk:merge
===================================================================


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


Modified: trunk/refman-5.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-definition.xml	2011-06-08 18:33:05 UTC (rev 26458)
+++ trunk/refman-5.0/sql-syntax-data-definition.xml	2011-06-08 19:36:28 UTC (rev 26459)
Changed blocks: 3, Lines Added: 97, Lines Deleted: 95; 10196 bytes

@@ -1106,135 +1106,135 @@
       <xref linkend="mysql-info"/>.
     </para>
 
-    <bridgehead>
-      <literal role="stmt">ALTER TABLE</literal> Examples
-    </bridgehead>
+    <section id="alter-table-examples">
 
-    <para>
-      Begin with a table <literal>t1</literal> that is created as shown
-      here:
-    </para>
+      <title><literal role="stmt">ALTER TABLE</literal> Examples</title>
 
+      <para>
+        Begin with a table <literal>t1</literal> that is created as
+        shown here:
+      </para>
+
 <programlisting>
 CREATE TABLE t1 (a INTEGER,b CHAR(10));
 </programlisting>
 
-    <para>
-      To rename the table from <literal>t1</literal> to
-      <literal>t2</literal>:
-    </para>
+      <para>
+        To rename the table from <literal>t1</literal> to
+        <literal>t2</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t1 RENAME t2;
 </programlisting>
 
-    <para>
-      To change column <literal>a</literal> from
-      <literal role="type">INTEGER</literal> to <literal>TINYINT NOT
-      NULL</literal> (leaving the name the same), and to change column
-      <literal>b</literal> from <literal>CHAR(10)</literal> to
-      <literal>CHAR(20)</literal> as well as renaming it from
-      <literal>b</literal> to <literal>c</literal>:
-    </para>
+      <para>
+        To change column <literal>a</literal> from
+        <literal role="type">INTEGER</literal> to <literal>TINYINT NOT
+        NULL</literal> (leaving the name the same), and to change column
+        <literal>b</literal> from <literal>CHAR(10)</literal> to
+        <literal>CHAR(20)</literal> as well as renaming it from
+        <literal>b</literal> to <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 MODIFY a TINYINT NOT NULL, CHANGE b c CHAR(20);
 </programlisting>
 
-    <para>
-      To add a new <literal role="type">TIMESTAMP</literal> column named
-      <literal>d</literal>:
-    </para>
+      <para>
+        To add a new <literal role="type">TIMESTAMP</literal> column
+        named <literal>d</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD d TIMESTAMP;
 </programlisting>
 
-    <para>
-      To add an index on column <literal>d</literal> and a
-      <literal>UNIQUE</literal> index on column <literal>a</literal>:
-    </para>
+      <para>
+        To add an index on column <literal>d</literal> and a
+        <literal>UNIQUE</literal> index on column <literal>a</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD INDEX (d), ADD UNIQUE (a);
 </programlisting>
 
-    <para>
-      To remove column <literal>c</literal>:
-    </para>
+      <para>
+        To remove column <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 DROP COLUMN c;
 </programlisting>
 
-    <para>
-      To add a new <literal>AUTO_INCREMENT</literal> integer column
-      named <literal>c</literal>:
-    </para>
+      <para>
+        To add a new <literal>AUTO_INCREMENT</literal> integer column
+        named <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD c INT UNSIGNED NOT NULL AUTO_INCREMENT,
   ADD PRIMARY KEY (c);
 </programlisting>
 
-    <para>
-      Note that we indexed <literal>c</literal> (as a <literal>PRIMARY
-      KEY</literal>) because <literal>AUTO_INCREMENT</literal> columns
-      must be indexed, and also that we declare <literal>c</literal> as
-      <literal>NOT NULL</literal> because primary key columns cannot be
-      <literal>NULL</literal>.
-    </para>
+      <para>
+        Note that we indexed <literal>c</literal> (as a <literal>PRIMARY
+        KEY</literal>) because <literal>AUTO_INCREMENT</literal> columns
+        must be indexed, and also that we declare <literal>c</literal>
+        as <literal>NOT NULL</literal> because primary key columns
+        cannot be <literal>NULL</literal>.
+      </para>
 
-    <para>
-      When you add an <literal>AUTO_INCREMENT</literal> column, column
-      values are filled in with sequence numbers automatically. For
-      <literal>MyISAM</literal> tables, you can set the first sequence
-      number by executing <literal>SET
-      INSERT_ID=<replaceable>value</replaceable></literal> before
-      <literal role="stmt">ALTER TABLE</literal> or by using the
-      <literal>AUTO_INCREMENT=<replaceable>value</replaceable></literal>
-      table option. See <xref linkend="server-system-variables"/>.
-    </para>
+      <para>
+        When you add an <literal>AUTO_INCREMENT</literal> column, column
+        values are filled in with sequence numbers automatically. For
+        <literal>MyISAM</literal> tables, you can set the first sequence
+        number by executing <literal>SET
+        INSERT_ID=<replaceable>value</replaceable></literal> before
+        <literal role="stmt">ALTER TABLE</literal> or by using the
+        <literal>AUTO_INCREMENT=<replaceable>value</replaceable></literal>
+        table option. See <xref linkend="server-system-variables"/>.
+      </para>
 
-    <para>
-      With <literal>MyISAM</literal> tables, if you do not change the
-      <literal>AUTO_INCREMENT</literal> column, the sequence number is
-      not affected. If you drop an <literal>AUTO_INCREMENT</literal>
-      column and then add another <literal>AUTO_INCREMENT</literal>
-      column, the numbers are resequenced beginning with 1.
-    </para>
+      <para>
+        With <literal>MyISAM</literal> tables, if you do not change the
+        <literal>AUTO_INCREMENT</literal> column, the sequence number is
+        not affected. If you drop an <literal>AUTO_INCREMENT</literal>
+        column and then add another <literal>AUTO_INCREMENT</literal>
+        column, the numbers are resequenced beginning with 1.
+      </para>
 
-    <para>
-      When replication is used, adding an
-      <literal>AUTO_INCREMENT</literal> column to a table 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>
+      <para>
+        When replication is used, adding an
+        <literal>AUTO_INCREMENT</literal> column to a table 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>
 CREATE TABLE t2 (id INT AUTO_INCREMENT PRIMARY KEY)
 SELECT * FROM t1 ORDER BY col1, col2;
 </programlisting>
 
-    <para>
-      This assumes that the table <literal>t1</literal> has columns
-      <literal>col1</literal> and <literal>col2</literal>.
-    </para>
+      <para>
+        This assumes that the table <literal>t1</literal> has columns
+        <literal>col1</literal> and <literal>col2</literal>.
+      </para>
 
-    <para>
-      This set of statements will also produce a new table
-      <literal>t2</literal> identical to <literal>t1</literal>, with the
-      addition of an <literal>AUTO_INCREMENT</literal> column:
-    </para>
+      <para>
+        This set of statements will also produce a new table
+        <literal>t2</literal> identical to <literal>t1</literal>, with
+        the addition of an <literal>AUTO_INCREMENT</literal> column:
+      </para>
 
 <programlisting>
 CREATE TABLE t2 LIKE t1;

@@ -1242,25 +1242,27 @@
 INSERT INTO t2 SELECT * FROM t1 ORDER BY col1, col2;
 </programlisting>
 
-    <important>
+      <important>
+        <para>
+          To guarantee the same ordering on both master and slave,
+          <emphasis>all</emphasis> columns of <literal>t1</literal> must
+          be referenced in the <literal>ORDER BY</literal> clause.
+        </para>
+      </important>
+
       <para>
-        To guarantee the same ordering on both master and slave,
-        <emphasis>all</emphasis> columns of <literal>t1</literal> must
-        be referenced in the <literal>ORDER BY</literal> clause.
+        Regardless of the method used to create and populate the copy
+        having the <literal>AUTO_INCREMENT</literal> column, the final
+        step is to drop the original table and then rename the copy:
       </para>
-    </important>
 
-    <para>
-      Regardless of the method used to create and populate the copy
-      having the <literal>AUTO_INCREMENT</literal> column, the final
-      step is to drop the original table and then rename the copy:
-    </para>
-
 <programlisting>
 DROP t1;
 ALTER TABLE t2 RENAME t1;
 </programlisting>
 
+    </section>
+
   </section>
 
   <section id="alter-view">

@@ -1864,8 +1866,8 @@
       engine, but there is another index type available that the engine
       can use without affecting query results, the engine uses the
       available type. The parser recognizes <literal>RTREE</literal> as
-      a type name, but currently this cannot be specified for any storage
-      engine.
+      a type name, but currently this cannot be specified for any
+      storage engine.
     </para>
 
     <para>


Modified: trunk/refman-5.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-definition.xml	2011-06-08 18:33:05 UTC (rev 26458)
+++ trunk/refman-5.1/sql-syntax-data-definition.xml	2011-06-08 19:36:28 UTC (rev 26459)
Changed blocks: 7, Lines Added: 135, Lines Deleted: 133; 14336 bytes

@@ -2523,101 +2523,101 @@
       <xref linkend="mysql-info"/>.
     </para>
 
-    <bridgehead>
-      <literal role="stmt">ALTER TABLE</literal> Examples
-    </bridgehead>
+    <section id="alter-table-examples">
 
-    <para>
-      Begin with a table <literal>t1</literal> that is created as shown
-      here:
-    </para>
+      <title><literal role="stmt">ALTER TABLE</literal> Examples</title>
 
+      <para>
+        Begin with a table <literal>t1</literal> that is created as
+        shown here:
+      </para>
+
 <programlisting>
 CREATE TABLE t1 (a INTEGER,b CHAR(10));
 </programlisting>
 
-    <para>
-      To rename the table from <literal>t1</literal> to
-      <literal>t2</literal>:
-    </para>
+      <para>
+        To rename the table from <literal>t1</literal> to
+        <literal>t2</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t1 RENAME t2;
 </programlisting>
 
-    <para>
-      To change column <literal>a</literal> from
-      <literal role="type">INTEGER</literal> to <literal>TINYINT NOT
-      NULL</literal> (leaving the name the same), and to change column
-      <literal>b</literal> from <literal>CHAR(10)</literal> to
-      <literal>CHAR(20)</literal> as well as renaming it from
-      <literal>b</literal> to <literal>c</literal>:
-    </para>
+      <para>
+        To change column <literal>a</literal> from
+        <literal role="type">INTEGER</literal> to <literal>TINYINT NOT
+        NULL</literal> (leaving the name the same), and to change column
+        <literal>b</literal> from <literal>CHAR(10)</literal> to
+        <literal>CHAR(20)</literal> as well as renaming it from
+        <literal>b</literal> to <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 MODIFY a TINYINT NOT NULL, CHANGE b c CHAR(20);
 </programlisting>
 
-    <para>
-      To add a new <literal role="type">TIMESTAMP</literal> column named
-      <literal>d</literal>:
-    </para>
+      <para>
+        To add a new <literal role="type">TIMESTAMP</literal> column
+        named <literal>d</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD d TIMESTAMP;
 </programlisting>
 
-    <para>
-      To add an index on column <literal>d</literal> and a
-      <literal>UNIQUE</literal> index on column <literal>a</literal>:
-    </para>
+      <para>
+        To add an index on column <literal>d</literal> and a
+        <literal>UNIQUE</literal> index on column <literal>a</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD INDEX (d), ADD UNIQUE (a);
 </programlisting>
 
-    <para>
-      To remove column <literal>c</literal>:
-    </para>
+      <para>
+        To remove column <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 DROP COLUMN c;
 </programlisting>
 
-    <para>
-      To add a new <literal>AUTO_INCREMENT</literal> integer column
-      named <literal>c</literal>:
-    </para>
+      <para>
+        To add a new <literal>AUTO_INCREMENT</literal> integer column
+        named <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD c INT UNSIGNED NOT NULL AUTO_INCREMENT,
   ADD PRIMARY KEY (c);
 </programlisting>
 
-    <para>
-      We indexed <literal>c</literal> (as a <literal>PRIMARY
-      KEY</literal>) because <literal>AUTO_INCREMENT</literal> columns
-      must be indexed, and we declare <literal>c</literal> as
-      <literal>NOT NULL</literal> because primary key columns cannot be
-      <literal>NULL</literal>.
-    </para>
+      <para>
+        We indexed <literal>c</literal> (as a <literal>PRIMARY
+        KEY</literal>) because <literal>AUTO_INCREMENT</literal> columns
+        must be indexed, and we declare <literal>c</literal> as
+        <literal>NOT NULL</literal> because primary key columns cannot
+        be <literal>NULL</literal>.
+      </para>
 
-    <para>
-      For <literal role="se">NDB</literal> tables, it is also possible
-      to change the storage type used for a table or column. For
-      example, consider an <literal role="se">NDB</literal> table
-      created as shown here:
-    </para>
+      <para>
+        For <literal role="se">NDB</literal> tables, it is also possible
+        to change the storage type used for a table or column. For
+        example, consider an <literal role="se">NDB</literal> table
+        created as shown here:
+      </para>
 
 <programlisting>
 mysql&gt; <userinput>CREATE TABLE t1 (c1 INT) TABLESPACE ts_1 ENGINE NDB;</userinput>
 Query OK, 0 rows affected (1.27 sec)
 </programlisting>
 
-    <para>
-      To convert this table to disk-based storage, you can use the
-      following <literal role="stmt">ALTER TABLE</literal> statement:
-    </para>
+      <para>
+        To convert this table to disk-based storage, you can use the
+        following <literal role="stmt">ALTER TABLE</literal> statement:
+      </para>
 
 <programlisting>
 mysql&gt; <userinput>ALTER TABLE t1 TABLESPACE ts_1 STORAGE DISK;</userinput>

@@ -2634,11 +2634,11 @@
 1 row in set (0.01 sec)
 </programlisting>
 
-    <para>
-      It is not necessary that the tablespace was referenced when the
-      table was originally created; however, the tablespace must be
-      referenced by the <literal role="stmt">ALTER TABLE</literal>:
-    </para>
+      <para>
+        It is not necessary that the tablespace was referenced when the
+        table was originally created; however, the tablespace must be
+        referenced by the <literal role="stmt">ALTER TABLE</literal>:
+      </para>
 
 <programlisting>
 mysql&gt; <userinput>CREATE TABLE t2 (c1 INT) ts_1 ENGINE NDB;</userinput>

@@ -2659,13 +2659,13 @@
 1 row in set (0.01 sec)
 </programlisting>
 
-    <para>
-      To change the storage type of an individual column, you can use
-      <literal>ALTER TABLE ... MODIFY [COLUMN]</literal>. For example,
-      suppose you create a MySQL Cluster Disk Data table with two
-      columns, using this <literal role="stmt">CREATE TABLE</literal>
-      statement:
-    </para>
+      <para>
+        To change the storage type of an individual column, you can use
+        <literal>ALTER TABLE ... MODIFY [COLUMN]</literal>. For example,
+        suppose you create a MySQL Cluster Disk Data table with two
+        columns, using this <literal role="stmt">CREATE TABLE</literal>
+        statement:
+      </para>
 
 <programlisting>
 mysql&gt; <userinput>CREATE TABLE t3 (c1 INT, c2 INT)</userinput>

@@ -2673,11 +2673,11 @@
 Query OK, 0 rows affected (1.34 sec)
 </programlisting>
 
-    <para>
-      To change column <literal>c2</literal> from disk-based to
-      in-memory storage, include a STORAGE MEMORY clause in the column
-      definition used by the ALTER TABLE statement, as shown here:
-    </para>
+      <para>
+        To change column <literal>c2</literal> from disk-based to
+        in-memory storage, include a STORAGE MEMORY clause in the column
+        definition used by the ALTER TABLE statement, as shown here:
+      </para>
 
 <programlisting>
 mysql&gt; <userinput>ALTER TABLE t3 MODIFY c2 INT STORAGE MEMORY;</userinput>

@@ -2685,20 +2685,20 @@
 Records: 0  Duplicates: 0  Warnings: 0
 </programlisting>
 
-    <para>
-      You can make an in-memory column into a disk-based column by using
-      <literal>STORAGE DISK</literal> in a similar fashion.
-    </para>
+      <para>
+        You can make an in-memory column into a disk-based column by
+        using <literal>STORAGE DISK</literal> in a similar fashion.
+      </para>
 
-    <para>
-      Column <literal>c1</literal> uses disk-based storage, since this
-      is the default for the table (determined by the table-level
-      <literal>STORAGE DISK</literal> clause in the
-      <literal role="stmt">CREATE TABLE</literal> statement). However,
-      column <literal>c2</literal> uses in-memory storage, as can be
-      seen here in the output of SHOW <literal role="stmt">CREATE
-      TABLE</literal>:
-    </para>
+      <para>
+        Column <literal>c1</literal> uses disk-based storage, since this
+        is the default for the table (determined by the table-level
+        <literal>STORAGE DISK</literal> clause in the
+        <literal role="stmt">CREATE TABLE</literal> statement). However,
+        column <literal>c2</literal> uses in-memory storage, as can be
+        seen here in the output of SHOW <literal role="stmt">CREATE
+        TABLE</literal>:
+      </para>
 
 <programlisting>
 mysql&gt; <userinput>SHOW CREATE TABLE t3\G</userinput>

@@ -2711,56 +2711,56 @@
 1 row in set (0.02 sec)
 </programlisting>
 
-    <para>
-      When you add an <literal>AUTO_INCREMENT</literal> column, column
-      values are filled in with sequence numbers automatically. For
-      <literal>MyISAM</literal> tables, you can set the first sequence
-      number by executing <literal>SET
-      INSERT_ID=<replaceable>value</replaceable></literal> before
-      <literal role="stmt">ALTER TABLE</literal> or by using the
-      <literal>AUTO_INCREMENT=<replaceable>value</replaceable></literal>
-      table option. See <xref linkend="server-system-variables"/>.
-    </para>
+      <para>
+        When you add an <literal>AUTO_INCREMENT</literal> column, column
+        values are filled in with sequence numbers automatically. For
+        <literal>MyISAM</literal> tables, you can set the first sequence
+        number by executing <literal>SET
+        INSERT_ID=<replaceable>value</replaceable></literal> before
+        <literal role="stmt">ALTER TABLE</literal> or by using the
+        <literal>AUTO_INCREMENT=<replaceable>value</replaceable></literal>
+        table option. See <xref linkend="server-system-variables"/>.
+      </para>
 
-    <para>
-      With <literal>MyISAM</literal> tables, if you do not change the
-      <literal>AUTO_INCREMENT</literal> column, the sequence number is
-      not affected. If you drop an <literal>AUTO_INCREMENT</literal>
-      column and then add another <literal>AUTO_INCREMENT</literal>
-      column, the numbers are resequenced beginning with 1.
-    </para>
+      <para>
+        With <literal>MyISAM</literal> tables, if you do not change the
+        <literal>AUTO_INCREMENT</literal> column, the sequence number is
+        not affected. If you drop an <literal>AUTO_INCREMENT</literal>
+        column and then add another <literal>AUTO_INCREMENT</literal>
+        column, the numbers are resequenced beginning with 1.
+      </para>
 
-    <para>
-      When replication is used, adding an
-      <literal>AUTO_INCREMENT</literal> column to a table 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>
+      <para>
+        When replication is used, adding an
+        <literal>AUTO_INCREMENT</literal> column to a table 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>
 CREATE TABLE t2 (id INT AUTO_INCREMENT PRIMARY KEY)
 SELECT * FROM t1 ORDER BY col1, col2;
 </programlisting>
 
-    <para>
-      This assumes that the table <literal>t1</literal> has columns
-      <literal>col1</literal> and <literal>col2</literal>.
-    </para>
+      <para>
+        This assumes that the table <literal>t1</literal> has columns
+        <literal>col1</literal> and <literal>col2</literal>.
+      </para>
 
-    <para>
-      This set of statements will also produce a new table
-      <literal>t2</literal> identical to <literal>t1</literal>, with the
-      addition of an <literal>AUTO_INCREMENT</literal> column:
-    </para>
+      <para>
+        This set of statements will also produce a new table
+        <literal>t2</literal> identical to <literal>t1</literal>, with
+        the addition of an <literal>AUTO_INCREMENT</literal> column:
+      </para>
 
 <programlisting>
 CREATE TABLE t2 LIKE t1;

@@ -2768,25 +2768,27 @@
 INSERT INTO t2 SELECT * FROM t1 ORDER BY col1, col2;
 </programlisting>
 
-    <important>
+      <important>
+        <para>
+          To guarantee the same ordering on both master and slave,
+          <emphasis>all</emphasis> columns of <literal>t1</literal> must
+          be referenced in the <literal>ORDER BY</literal> clause.
+        </para>
+      </important>
+
       <para>
-        To guarantee the same ordering on both master and slave,
-        <emphasis>all</emphasis> columns of <literal>t1</literal> must
-        be referenced in the <literal>ORDER BY</literal> clause.
+        Regardless of the method used to create and populate the copy
+        having the <literal>AUTO_INCREMENT</literal> column, the final
+        step is to drop the original table and then rename the copy:
       </para>
-    </important>
 
-    <para>
-      Regardless of the method used to create and populate the copy
-      having the <literal>AUTO_INCREMENT</literal> column, the final
-      step is to drop the original table and then rename the copy:
-    </para>
-
 <programlisting>
 DROP t1;
 ALTER TABLE t2 RENAME t1;
 </programlisting>
 
+    </section>
+
   </section>
 
   <section id="alter-tablespace">


Modified: trunk/refman-5.5/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.5/sql-syntax-data-definition.xml	2011-06-08 18:33:05 UTC (rev 26458)
+++ trunk/refman-5.5/sql-syntax-data-definition.xml	2011-06-08 19:36:28 UTC (rev 26459)
Changed blocks: 2, Lines Added: 95, Lines Deleted: 93; 9724 bytes

@@ -1966,135 +1966,135 @@
       <xref linkend="mysql-info"/>.
     </para>
 
-    <bridgehead>
-      <literal role="stmt">ALTER TABLE</literal> Examples
-    </bridgehead>
+    <section id="alter-table-examples">
 
-    <para>
-      Begin with a table <literal>t1</literal> that is created as shown
-      here:
-    </para>
+      <title><literal role="stmt">ALTER TABLE</literal> Examples</title>
 
+      <para>
+        Begin with a table <literal>t1</literal> that is created as
+        shown here:
+      </para>
+
 <programlisting>
 CREATE TABLE t1 (a INTEGER,b CHAR(10));
 </programlisting>
 
-    <para>
-      To rename the table from <literal>t1</literal> to
-      <literal>t2</literal>:
-    </para>
+      <para>
+        To rename the table from <literal>t1</literal> to
+        <literal>t2</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t1 RENAME t2;
 </programlisting>
 
-    <para>
-      To change column <literal>a</literal> from
-      <literal role="type">INTEGER</literal> to <literal>TINYINT NOT
-      NULL</literal> (leaving the name the same), and to change column
-      <literal>b</literal> from <literal>CHAR(10)</literal> to
-      <literal>CHAR(20)</literal> as well as renaming it from
-      <literal>b</literal> to <literal>c</literal>:
-    </para>
+      <para>
+        To change column <literal>a</literal> from
+        <literal role="type">INTEGER</literal> to <literal>TINYINT NOT
+        NULL</literal> (leaving the name the same), and to change column
+        <literal>b</literal> from <literal>CHAR(10)</literal> to
+        <literal>CHAR(20)</literal> as well as renaming it from
+        <literal>b</literal> to <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 MODIFY a TINYINT NOT NULL, CHANGE b c CHAR(20);
 </programlisting>
 
-    <para>
-      To add a new <literal role="type">TIMESTAMP</literal> column named
-      <literal>d</literal>:
-    </para>
+      <para>
+        To add a new <literal role="type">TIMESTAMP</literal> column
+        named <literal>d</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD d TIMESTAMP;
 </programlisting>
 
-    <para>
-      To add an index on column <literal>d</literal> and a
-      <literal>UNIQUE</literal> index on column <literal>a</literal>:
-    </para>
+      <para>
+        To add an index on column <literal>d</literal> and a
+        <literal>UNIQUE</literal> index on column <literal>a</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD INDEX (d), ADD UNIQUE (a);
 </programlisting>
 
-    <para>
-      To remove column <literal>c</literal>:
-    </para>
+      <para>
+        To remove column <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 DROP COLUMN c;
 </programlisting>
 
-    <para>
-      To add a new <literal>AUTO_INCREMENT</literal> integer column
-      named <literal>c</literal>:
-    </para>
+      <para>
+        To add a new <literal>AUTO_INCREMENT</literal> integer column
+        named <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD c INT UNSIGNED NOT NULL AUTO_INCREMENT,
   ADD PRIMARY KEY (c);
 </programlisting>
 
-    <para>
-      We indexed <literal>c</literal> (as a <literal>PRIMARY
-      KEY</literal>) because <literal>AUTO_INCREMENT</literal> columns
-      must be indexed, and we declare <literal>c</literal> as
-      <literal>NOT NULL</literal> because primary key columns cannot be
-      <literal>NULL</literal>.
-    </para>
+      <para>
+        We indexed <literal>c</literal> (as a <literal>PRIMARY
+        KEY</literal>) because <literal>AUTO_INCREMENT</literal> columns
+        must be indexed, and we declare <literal>c</literal> as
+        <literal>NOT NULL</literal> because primary key columns cannot
+        be <literal>NULL</literal>.
+      </para>
 
-    <para>
-      When you add an <literal>AUTO_INCREMENT</literal> column, column
-      values are filled in with sequence numbers automatically. For
-      <literal>MyISAM</literal> tables, you can set the first sequence
-      number by executing <literal>SET
-      INSERT_ID=<replaceable>value</replaceable></literal> before
-      <literal role="stmt">ALTER TABLE</literal> or by using the
-      <literal>AUTO_INCREMENT=<replaceable>value</replaceable></literal>
-      table option. See <xref linkend="server-system-variables"/>.
-    </para>
+      <para>
+        When you add an <literal>AUTO_INCREMENT</literal> column, column
+        values are filled in with sequence numbers automatically. For
+        <literal>MyISAM</literal> tables, you can set the first sequence
+        number by executing <literal>SET
+        INSERT_ID=<replaceable>value</replaceable></literal> before
+        <literal role="stmt">ALTER TABLE</literal> or by using the
+        <literal>AUTO_INCREMENT=<replaceable>value</replaceable></literal>
+        table option. See <xref linkend="server-system-variables"/>.
+      </para>
 
-    <para>
-      With <literal>MyISAM</literal> tables, if you do not change the
-      <literal>AUTO_INCREMENT</literal> column, the sequence number is
-      not affected. If you drop an <literal>AUTO_INCREMENT</literal>
-      column and then add another <literal>AUTO_INCREMENT</literal>
-      column, the numbers are resequenced beginning with 1.
-    </para>
+      <para>
+        With <literal>MyISAM</literal> tables, if you do not change the
+        <literal>AUTO_INCREMENT</literal> column, the sequence number is
+        not affected. If you drop an <literal>AUTO_INCREMENT</literal>
+        column and then add another <literal>AUTO_INCREMENT</literal>
+        column, the numbers are resequenced beginning with 1.
+      </para>
 
-    <para>
-      When replication is used, adding an
-      <literal>AUTO_INCREMENT</literal> column to a table 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>
+      <para>
+        When replication is used, adding an
+        <literal>AUTO_INCREMENT</literal> column to a table 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>
 CREATE TABLE t2 (id INT AUTO_INCREMENT PRIMARY KEY)
 SELECT * FROM t1 ORDER BY col1, col2;
 </programlisting>
 
-    <para>
-      This assumes that the table <literal>t1</literal> has columns
-      <literal>col1</literal> and <literal>col2</literal>.
-    </para>
+      <para>
+        This assumes that the table <literal>t1</literal> has columns
+        <literal>col1</literal> and <literal>col2</literal>.
+      </para>
 
-    <para>
-      This set of statements will also produce a new table
-      <literal>t2</literal> identical to <literal>t1</literal>, with the
-      addition of an <literal>AUTO_INCREMENT</literal> column:
-    </para>
+      <para>
+        This set of statements will also produce a new table
+        <literal>t2</literal> identical to <literal>t1</literal>, with
+        the addition of an <literal>AUTO_INCREMENT</literal> column:
+      </para>
 
 <programlisting>
 CREATE TABLE t2 LIKE t1;

@@ -2102,25 +2102,27 @@
 INSERT INTO t2 SELECT * FROM t1 ORDER BY col1, col2;
 </programlisting>
 
-    <important>
+      <important>
+        <para>
+          To guarantee the same ordering on both master and slave,
+          <emphasis>all</emphasis> columns of <literal>t1</literal> must
+          be referenced in the <literal>ORDER BY</literal> clause.
+        </para>
+      </important>
+
       <para>
-        To guarantee the same ordering on both master and slave,
-        <emphasis>all</emphasis> columns of <literal>t1</literal> must
-        be referenced in the <literal>ORDER BY</literal> clause.
+        Regardless of the method used to create and populate the copy
+        having the <literal>AUTO_INCREMENT</literal> column, the final
+        step is to drop the original table and then rename the copy:
       </para>
-    </important>
 
-    <para>
-      Regardless of the method used to create and populate the copy
-      having the <literal>AUTO_INCREMENT</literal> column, the final
-      step is to drop the original table and then rename the copy:
-    </para>
-
 <programlisting>
 DROP t1;
 ALTER TABLE t2 RENAME t1;
 </programlisting>
 
+    </section>
+
   </section>
 
   <section id="alter-view">


Modified: trunk/refman-5.6/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.6/sql-syntax-data-definition.xml	2011-06-08 18:33:05 UTC (rev 26458)
+++ trunk/refman-5.6/sql-syntax-data-definition.xml	2011-06-08 19:36:28 UTC (rev 26459)
Changed blocks: 2, Lines Added: 95, Lines Deleted: 93; 9724 bytes

@@ -2019,135 +2019,135 @@
       <xref linkend="mysql-info"/>.
     </para>
 
-    <bridgehead>
-      <literal role="stmt">ALTER TABLE</literal> Examples
-    </bridgehead>
+    <section id="alter-table-examples">
 
-    <para>
-      Begin with a table <literal>t1</literal> that is created as shown
-      here:
-    </para>
+      <title><literal role="stmt">ALTER TABLE</literal> Examples</title>
 
+      <para>
+        Begin with a table <literal>t1</literal> that is created as
+        shown here:
+      </para>
+
 <programlisting>
 CREATE TABLE t1 (a INTEGER,b CHAR(10));
 </programlisting>
 
-    <para>
-      To rename the table from <literal>t1</literal> to
-      <literal>t2</literal>:
-    </para>
+      <para>
+        To rename the table from <literal>t1</literal> to
+        <literal>t2</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t1 RENAME t2;
 </programlisting>
 
-    <para>
-      To change column <literal>a</literal> from
-      <literal role="type">INTEGER</literal> to <literal>TINYINT NOT
-      NULL</literal> (leaving the name the same), and to change column
-      <literal>b</literal> from <literal>CHAR(10)</literal> to
-      <literal>CHAR(20)</literal> as well as renaming it from
-      <literal>b</literal> to <literal>c</literal>:
-    </para>
+      <para>
+        To change column <literal>a</literal> from
+        <literal role="type">INTEGER</literal> to <literal>TINYINT NOT
+        NULL</literal> (leaving the name the same), and to change column
+        <literal>b</literal> from <literal>CHAR(10)</literal> to
+        <literal>CHAR(20)</literal> as well as renaming it from
+        <literal>b</literal> to <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 MODIFY a TINYINT NOT NULL, CHANGE b c CHAR(20);
 </programlisting>
 
-    <para>
-      To add a new <literal role="type">TIMESTAMP</literal> column named
-      <literal>d</literal>:
-    </para>
+      <para>
+        To add a new <literal role="type">TIMESTAMP</literal> column
+        named <literal>d</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD d TIMESTAMP;
 </programlisting>
 
-    <para>
-      To add an index on column <literal>d</literal> and a
-      <literal>UNIQUE</literal> index on column <literal>a</literal>:
-    </para>
+      <para>
+        To add an index on column <literal>d</literal> and a
+        <literal>UNIQUE</literal> index on column <literal>a</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD INDEX (d), ADD UNIQUE (a);
 </programlisting>
 
-    <para>
-      To remove column <literal>c</literal>:
-    </para>
+      <para>
+        To remove column <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 DROP COLUMN c;
 </programlisting>
 
-    <para>
-      To add a new <literal>AUTO_INCREMENT</literal> integer column
-      named <literal>c</literal>:
-    </para>
+      <para>
+        To add a new <literal>AUTO_INCREMENT</literal> integer column
+        named <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD c INT UNSIGNED NOT NULL AUTO_INCREMENT,
   ADD PRIMARY KEY (c);
 </programlisting>
 
-    <para>
-      We indexed <literal>c</literal> (as a <literal>PRIMARY
-      KEY</literal>) because <literal>AUTO_INCREMENT</literal> columns
-      must be indexed, and we declare <literal>c</literal> as
-      <literal>NOT NULL</literal> because primary key columns cannot be
-      <literal>NULL</literal>.
-    </para>
+      <para>
+        We indexed <literal>c</literal> (as a <literal>PRIMARY
+        KEY</literal>) because <literal>AUTO_INCREMENT</literal> columns
+        must be indexed, and we declare <literal>c</literal> as
+        <literal>NOT NULL</literal> because primary key columns cannot
+        be <literal>NULL</literal>.
+      </para>
 
-    <para>
-      When you add an <literal>AUTO_INCREMENT</literal> column, column
-      values are filled in with sequence numbers automatically. For
-      <literal>MyISAM</literal> tables, you can set the first sequence
-      number by executing <literal>SET
-      INSERT_ID=<replaceable>value</replaceable></literal> before
-      <literal role="stmt">ALTER TABLE</literal> or by using the
-      <literal>AUTO_INCREMENT=<replaceable>value</replaceable></literal>
-      table option. See <xref linkend="server-system-variables"/>.
-    </para>
+      <para>
+        When you add an <literal>AUTO_INCREMENT</literal> column, column
+        values are filled in with sequence numbers automatically. For
+        <literal>MyISAM</literal> tables, you can set the first sequence
+        number by executing <literal>SET
+        INSERT_ID=<replaceable>value</replaceable></literal> before
+        <literal role="stmt">ALTER TABLE</literal> or by using the
+        <literal>AUTO_INCREMENT=<replaceable>value</replaceable></literal>
+        table option. See <xref linkend="server-system-variables"/>.
+      </para>
 
-    <para>
-      With <literal>MyISAM</literal> tables, if you do not change the
-      <literal>AUTO_INCREMENT</literal> column, the sequence number is
-      not affected. If you drop an <literal>AUTO_INCREMENT</literal>
-      column and then add another <literal>AUTO_INCREMENT</literal>
-      column, the numbers are resequenced beginning with 1.
-    </para>
+      <para>
+        With <literal>MyISAM</literal> tables, if you do not change the
+        <literal>AUTO_INCREMENT</literal> column, the sequence number is
+        not affected. If you drop an <literal>AUTO_INCREMENT</literal>
+        column and then add another <literal>AUTO_INCREMENT</literal>
+        column, the numbers are resequenced beginning with 1.
+      </para>
 
-    <para>
-      When replication is used, adding an
-      <literal>AUTO_INCREMENT</literal> column to a table 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>
+      <para>
+        When replication is used, adding an
+        <literal>AUTO_INCREMENT</literal> column to a table 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>
 CREATE TABLE t2 (id INT AUTO_INCREMENT PRIMARY KEY)
 SELECT * FROM t1 ORDER BY col1, col2;
 </programlisting>
 
-    <para>
-      This assumes that the table <literal>t1</literal> has columns
-      <literal>col1</literal> and <literal>col2</literal>.
-    </para>
+      <para>
+        This assumes that the table <literal>t1</literal> has columns
+        <literal>col1</literal> and <literal>col2</literal>.
+      </para>
 
-    <para>
-      This set of statements will also produce a new table
-      <literal>t2</literal> identical to <literal>t1</literal>, with the
-      addition of an <literal>AUTO_INCREMENT</literal> column:
-    </para>
+      <para>
+        This set of statements will also produce a new table
+        <literal>t2</literal> identical to <literal>t1</literal>, with
+        the addition of an <literal>AUTO_INCREMENT</literal> column:
+      </para>
 
 <programlisting>
 CREATE TABLE t2 LIKE t1;

@@ -2155,25 +2155,27 @@
 INSERT INTO t2 SELECT * FROM t1 ORDER BY col1, col2;
 </programlisting>
 
-    <important>
+      <important>
+        <para>
+          To guarantee the same ordering on both master and slave,
+          <emphasis>all</emphasis> columns of <literal>t1</literal> must
+          be referenced in the <literal>ORDER BY</literal> clause.
+        </para>
+      </important>
+
       <para>
-        To guarantee the same ordering on both master and slave,
-        <emphasis>all</emphasis> columns of <literal>t1</literal> must
-        be referenced in the <literal>ORDER BY</literal> clause.
+        Regardless of the method used to create and populate the copy
+        having the <literal>AUTO_INCREMENT</literal> column, the final
+        step is to drop the original table and then rename the copy:
       </para>
-    </important>
 
-    <para>
-      Regardless of the method used to create and populate the copy
-      having the <literal>AUTO_INCREMENT</literal> column, the final
-      step is to drop the original table and then rename the copy:
-    </para>
-
 <programlisting>
 DROP t1;
 ALTER TABLE t2 RENAME t1;
 </programlisting>
 
+    </section>
+
   </section>
 
   <section id="alter-view">


Modified: trunk/refman-6.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-definition.xml	2011-06-08 18:33:05 UTC (rev 26458)
+++ trunk/refman-6.0/sql-syntax-data-definition.xml	2011-06-08 19:36:28 UTC (rev 26459)
Changed blocks: 2, Lines Added: 95, Lines Deleted: 93; 9724 bytes

@@ -2001,135 +2001,135 @@
       <xref linkend="mysql-info"/>.
     </para>
 
-    <bridgehead>
-      <literal role="stmt">ALTER TABLE</literal> Examples
-    </bridgehead>
+    <section id="alter-table-examples">
 
-    <para>
-      Begin with a table <literal>t1</literal> that is created as shown
-      here:
-    </para>
+      <title><literal role="stmt">ALTER TABLE</literal> Examples</title>
 
+      <para>
+        Begin with a table <literal>t1</literal> that is created as
+        shown here:
+      </para>
+
 <programlisting>
 CREATE TABLE t1 (a INTEGER,b CHAR(10));
 </programlisting>
 
-    <para>
-      To rename the table from <literal>t1</literal> to
-      <literal>t2</literal>:
-    </para>
+      <para>
+        To rename the table from <literal>t1</literal> to
+        <literal>t2</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t1 RENAME t2;
 </programlisting>
 
-    <para>
-      To change column <literal>a</literal> from
-      <literal role="type">INTEGER</literal> to <literal>TINYINT NOT
-      NULL</literal> (leaving the name the same), and to change column
-      <literal>b</literal> from <literal>CHAR(10)</literal> to
-      <literal>CHAR(20)</literal> as well as renaming it from
-      <literal>b</literal> to <literal>c</literal>:
-    </para>
+      <para>
+        To change column <literal>a</literal> from
+        <literal role="type">INTEGER</literal> to <literal>TINYINT NOT
+        NULL</literal> (leaving the name the same), and to change column
+        <literal>b</literal> from <literal>CHAR(10)</literal> to
+        <literal>CHAR(20)</literal> as well as renaming it from
+        <literal>b</literal> to <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 MODIFY a TINYINT NOT NULL, CHANGE b c CHAR(20);
 </programlisting>
 
-    <para>
-      To add a new <literal role="type">TIMESTAMP</literal> column named
-      <literal>d</literal>:
-    </para>
+      <para>
+        To add a new <literal role="type">TIMESTAMP</literal> column
+        named <literal>d</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD d TIMESTAMP;
 </programlisting>
 
-    <para>
-      To add an index on column <literal>d</literal> and a
-      <literal>UNIQUE</literal> index on column <literal>a</literal>:
-    </para>
+      <para>
+        To add an index on column <literal>d</literal> and a
+        <literal>UNIQUE</literal> index on column <literal>a</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD INDEX (d), ADD UNIQUE (a);
 </programlisting>
 
-    <para>
-      To remove column <literal>c</literal>:
-    </para>
+      <para>
+        To remove column <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 DROP COLUMN c;
 </programlisting>
 
-    <para>
-      To add a new <literal>AUTO_INCREMENT</literal> integer column
-      named <literal>c</literal>:
-    </para>
+      <para>
+        To add a new <literal>AUTO_INCREMENT</literal> integer column
+        named <literal>c</literal>:
+      </para>
 
 <programlisting>
 ALTER TABLE t2 ADD c INT UNSIGNED NOT NULL AUTO_INCREMENT,
   ADD PRIMARY KEY (c);
 </programlisting>
 
-    <para>
-      We indexed <literal>c</literal> (as a <literal>PRIMARY
-      KEY</literal>) because <literal>AUTO_INCREMENT</literal> columns
-      must be indexed, and we declare <literal>c</literal> as
-      <literal>NOT NULL</literal> because primary key columns cannot be
-      <literal>NULL</literal>.
-    </para>
+      <para>
+        We indexed <literal>c</literal> (as a <literal>PRIMARY
+        KEY</literal>) because <literal>AUTO_INCREMENT</literal> columns
+        must be indexed, and we declare <literal>c</literal> as
+        <literal>NOT NULL</literal> because primary key columns cannot
+        be <literal>NULL</literal>.
+      </para>
 
-    <para>
-      When you add an <literal>AUTO_INCREMENT</literal> column, column
-      values are filled in with sequence numbers automatically. For
-      <literal>MyISAM</literal> tables, you can set the first sequence
-      number by executing <literal>SET
-      INSERT_ID=<replaceable>value</replaceable></literal> before
-      <literal role="stmt">ALTER TABLE</literal> or by using the
-      <literal>AUTO_INCREMENT=<replaceable>value</replaceable></literal>
-      table option. See <xref linkend="server-system-variables"/>.
-    </para>
+      <para>
+        When you add an <literal>AUTO_INCREMENT</literal> column, column
+        values are filled in with sequence numbers automatically. For
+        <literal>MyISAM</literal> tables, you can set the first sequence
+        number by executing <literal>SET
+        INSERT_ID=<replaceable>value</replaceable></literal> before
+        <literal role="stmt">ALTER TABLE</literal> or by using the
+        <literal>AUTO_INCREMENT=<replaceable>value</replaceable></literal>
+        table option. See <xref linkend="server-system-variables"/>.
+      </para>
 
-    <para>
-      With <literal>MyISAM</literal> tables, if you do not change the
-      <literal>AUTO_INCREMENT</literal> column, the sequence number is
-      not affected. If you drop an <literal>AUTO_INCREMENT</literal>
-      column and then add another <literal>AUTO_INCREMENT</literal>
-      column, the numbers are resequenced beginning with 1.
-    </para>
+      <para>
+        With <literal>MyISAM</literal> tables, if you do not change the
+        <literal>AUTO_INCREMENT</literal> column, the sequence number is
+        not affected. If you drop an <literal>AUTO_INCREMENT</literal>
+        column and then add another <literal>AUTO_INCREMENT</literal>
+        column, the numbers are resequenced beginning with 1.
+      </para>
 
-    <para>
-      When replication is used, adding an
-      <literal>AUTO_INCREMENT</literal> column to a table 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>
+      <para>
+        When replication is used, adding an
+        <literal>AUTO_INCREMENT</literal> column to a table 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>
 CREATE TABLE t2 (id INT AUTO_INCREMENT PRIMARY KEY)
 SELECT * FROM t1 ORDER BY col1, col2;
 </programlisting>
 
-    <para>
-      This assumes that the table <literal>t1</literal> has columns
-      <literal>col1</literal> and <literal>col2</literal>.
-    </para>
+      <para>
+        This assumes that the table <literal>t1</literal> has columns
+        <literal>col1</literal> and <literal>col2</literal>.
+      </para>
 
-    <para>
-      This set of statements will also produce a new table
-      <literal>t2</literal> identical to <literal>t1</literal>, with the
-      addition of an <literal>AUTO_INCREMENT</literal> column:
-    </para>
+      <para>
+        This set of statements will also produce a new table
+        <literal>t2</literal> identical to <literal>t1</literal>, with
+        the addition of an <literal>AUTO_INCREMENT</literal> column:
+      </para>
 
 <programlisting>
 CREATE TABLE t2 LIKE t1;

@@ -2137,25 +2137,27 @@
 INSERT INTO t2 SELECT * FROM t1 ORDER BY col1, col2;
 </programlisting>
 
-    <important>
+      <important>
+        <para>
+          To guarantee the same ordering on both master and slave,
+          <emphasis>all</emphasis> columns of <literal>t1</literal> must
+          be referenced in the <literal>ORDER BY</literal> clause.
+        </para>
+      </important>
+
       <para>
-        To guarantee the same ordering on both master and slave,
-        <emphasis>all</emphasis> columns of <literal>t1</literal> must
-        be referenced in the <literal>ORDER BY</literal> clause.
+        Regardless of the method used to create and populate the copy
+        having the <literal>AUTO_INCREMENT</literal> column, the final
+        step is to drop the original table and then rename the copy:
       </para>
-    </important>
 
-    <para>
-      Regardless of the method used to create and populate the copy
-      having the <literal>AUTO_INCREMENT</literal> column, the final
-      step is to drop the original table and then rename the copy:
-    </para>
-
 <programlisting>
 DROP t1;
 ALTER TABLE t2 RENAME t1;
 </programlisting>
 
+    </section>
+
   </section>
 
   <section id="alter-view">


Thread
svn commit - mysqldoc@oter02: r26459 - in trunk: . refman-5.0 refman-5.1 refman-5.5 refman-5.6 refman-6.0paul.dubois9 Jun