List:Commits« Previous MessageNext Message »
From:paul Date:October 3 2007 4:51pm
Subject:svn commit - mysqldoc@docsrva: r7955 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.2
View as plain text  
Author: paul
Date: 2007-10-03 18:51:03 +0200 (Wed, 03 Oct 2007)
New Revision: 7955

Log:
 r25284@frost:  paul | 2007-10-03 09:35:04 -0500
 For CREATE|ALTER TABLE, change column_definition to
 col_name column_definition.  It's been confusing users that
 the definition includes the name, particularly for ALTER TABLE CHANGE,
 for which the syntax listed only one column name explicitly.


Modified:
   trunk/refman-4.1/mysql-cluster-multi-computer.xml
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/mysql-cluster-multi-computer.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml
   trunk/refman-5.1/mysql-cluster-multi-computer.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-5.2/mysql-cluster-multi-computer.xml
   trunk/refman-5.2/sql-syntax.xml

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


Modified: trunk/refman-4.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-4.1/mysql-cluster-multi-computer.xml	2007-10-03 16:50:40 UTC (rev 7954)
+++ trunk/refman-4.1/mysql-cluster-multi-computer.xml	2007-10-03 16:51:03 UTC (rev 7955)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 659 bytes

@@ -1251,7 +1251,7 @@
         </para>
 
 <programlisting>
-CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>column_definitions</replaceable>) ENGINE=NDBCLUSTER;
+CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>col_name</replaceable> <replaceable>column_definitions</replaceable>) ENGINE=NDBCLUSTER;
 </programlisting>
 
         <para>


Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2007-10-03 16:50:40 UTC (rev 7954)
+++ trunk/refman-4.1/sql-syntax.xml	2007-10-03 16:51:03 UTC (rev 7955)
Changed blocks: 6, Lines Added: 10, Lines Deleted: 11; 4509 bytes

@@ -138,8 +138,8 @@
 
 <replaceable>alter_specification</replaceable>:
     <replaceable>table_option</replaceable> ...
-  | ADD [COLUMN] <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable> ]
-  | ADD [COLUMN] (<replaceable>column_definition</replaceable>,...)
+  | ADD [COLUMN] <replaceable>col_name</replaceable> <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable> ]
+  | ADD [COLUMN] (<replaceable>col_name</replaceable> <replaceable>column_definition</replaceable>,...)
   | ADD {INDEX|KEY} [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
   | ADD [CONSTRAINT [<replaceable>symbol</replaceable>]]
         PRIMARY KEY [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)

@@ -150,9 +150,9 @@
         FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
         <replaceable>reference_definition</replaceable>
   | ALTER [COLUMN] <replaceable>col_name</replaceable> {SET DEFAULT <replaceable>literal</replaceable> | DROP DEFAULT}
-  | CHANGE [COLUMN] <replaceable>old_col_name</replaceable> <replaceable>column_definition</replaceable>
+  | CHANGE [COLUMN] <replaceable>old_col_name</replaceable> <replaceable>new_col_name</replaceable> <replaceable>column_definition</replaceable>
         [FIRST|AFTER <replaceable>col_name</replaceable>]
-  | MODIFY [COLUMN] <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable>]
+  | MODIFY [COLUMN] <replaceable>col_name</replaceable> <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable>]
   | DROP [COLUMN] <replaceable>col_name</replaceable>
   | DROP PRIMARY KEY
   | DROP {INDEX|KEY} <replaceable>index_name</replaceable>

@@ -366,9 +366,7 @@
             <replaceable>column_definition</replaceable> clauses use the
             same syntax for <literal>ADD</literal> and
             <literal>CHANGE</literal> as for <literal>CREATE
-            TABLE</literal>. Note that this syntax includes the column
-            name, not just its data type. See
-            <xref linkend="create-table"/>.
+            TABLE</literal>. See <xref linkend="create-table"/>.
           </para>
         </listitem>
 

@@ -376,10 +374,11 @@
           <para>
             You can rename a column using a <literal>CHANGE
             <replaceable>old_col_name</replaceable>
+            <replaceable>new_col_name</replaceable>
             <replaceable>column_definition</replaceable></literal>
             clause. To do so, specify the old and new column names and
-            the type that the column currently has. For example, to
-            rename an <literal>INTEGER</literal> column from
+            the definition that the column currently has. For example,
+            to rename an <literal>INTEGER</literal> column from
             <literal>a</literal> to <literal>b</literal>, you can do
             this:
           </para>

@@ -1555,7 +1554,7 @@
     { LIKE <replaceable>old_tbl_name</replaceable> | (LIKE <replaceable>old_tbl_name</replaceable>) }
 
 <replaceable>create_definition</replaceable>:
-    <replaceable>column_definition</replaceable>
+    <replaceable>col_name</replaceable> <replaceable>column_definition</replaceable>
   | [CONSTRAINT [<replaceable>symbol</replaceable>]] PRIMARY KEY [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
   | {INDEX|KEY} [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
   | [CONSTRAINT [<replaceable>symbol</replaceable>]] UNIQUE [INDEX|KEY]

@@ -1566,7 +1565,7 @@
   | CHECK (<replaceable>expr</replaceable>)
 
 <replaceable>column_definition</replaceable>:
-    <replaceable>col_name</replaceable> <replaceable>data_type</replaceable> [NOT NULL | NULL] [DEFAULT <replaceable>default_value</replaceable>]
+    <replaceable>data_type</replaceable> [NOT NULL | NULL] [DEFAULT <replaceable>default_value</replaceable>]
       [AUTO_INCREMENT] [UNIQUE [KEY] | [PRIMARY] KEY]
       [COMMENT '<replaceable>string</replaceable>'] [<replaceable>reference_definition</replaceable>]
 


Modified: trunk/refman-5.0/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.0/mysql-cluster-multi-computer.xml	2007-10-03 16:50:40 UTC (rev 7954)
+++ trunk/refman-5.0/mysql-cluster-multi-computer.xml	2007-10-03 16:51:03 UTC (rev 7955)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 659 bytes

@@ -1245,7 +1245,7 @@
         </para>
 
 <programlisting>
-CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>column_definitions</replaceable>) ENGINE=NDBCLUSTER;
+CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>col_name</replaceable> <replaceable>column_definitions</replaceable>) ENGINE=NDBCLUSTER;
 </programlisting>
 
         <para>


Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2007-10-03 16:50:40 UTC (rev 7954)
+++ trunk/refman-5.0/sql-syntax.xml	2007-10-03 16:51:03 UTC (rev 7955)
Changed blocks: 6, Lines Added: 10, Lines Deleted: 11; 4509 bytes

@@ -180,8 +180,8 @@
 
 <replaceable>alter_specification</replaceable>:
     <replaceable>table_option</replaceable> ...
-  | ADD [COLUMN] <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable> ]
-  | ADD [COLUMN] (<replaceable>column_definition</replaceable>,...)
+  | ADD [COLUMN] <replaceable>col_name</replaceable> <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable> ]
+  | ADD [COLUMN] (<replaceable>col_name</replaceable> <replaceable>column_definition</replaceable>,...)
   | ADD {INDEX|KEY} [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
   | ADD [CONSTRAINT [<replaceable>symbol</replaceable>]]
         PRIMARY KEY [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)

@@ -192,9 +192,9 @@
         FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
         <replaceable>reference_definition</replaceable>
   | ALTER [COLUMN] <replaceable>col_name</replaceable> {SET DEFAULT <replaceable>literal</replaceable> | DROP DEFAULT}
-  | CHANGE [COLUMN] <replaceable>old_col_name</replaceable> <replaceable>column_definition</replaceable>
+  | CHANGE [COLUMN] <replaceable>old_col_name</replaceable> <replaceable>new_col_name</replaceable> <replaceable>column_definition</replaceable>
         [FIRST|AFTER <replaceable>col_name</replaceable>]
-  | MODIFY [COLUMN] <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable>]
+  | MODIFY [COLUMN] <replaceable>col_name</replaceable> <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable>]
   | DROP [COLUMN] <replaceable>col_name</replaceable>
   | DROP PRIMARY KEY
   | DROP {INDEX|KEY} <replaceable>index_name</replaceable>

@@ -418,9 +418,7 @@
             <replaceable>column_definition</replaceable> clauses use the
             same syntax for <literal>ADD</literal> and
             <literal>CHANGE</literal> as for <literal>CREATE
-            TABLE</literal>. Note that this syntax includes the column
-            name, not just its data type. See
-            <xref linkend="create-table"/>.
+            TABLE</literal>. See <xref linkend="create-table"/>.
           </para>
         </listitem>
 

@@ -428,10 +426,11 @@
           <para>
             You can rename a column using a <literal>CHANGE
             <replaceable>old_col_name</replaceable>
+            <replaceable>new_col_name</replaceable>
             <replaceable>column_definition</replaceable></literal>
             clause. To do so, specify the old and new column names and
-            the type that the column currently has. For example, to
-            rename an <literal>INTEGER</literal> column from
+            the definition that the column currently has. For example,
+            to rename an <literal>INTEGER</literal> column from
             <literal>a</literal> to <literal>b</literal>, you can do
             this:
           </para>

@@ -1630,7 +1629,7 @@
     { LIKE <replaceable>old_tbl_name</replaceable> | (LIKE <replaceable>old_tbl_name</replaceable>) }
 
 <replaceable>create_definition</replaceable>:
-    <replaceable>column_definition</replaceable>
+    <replaceable>col_name</replaceable> <replaceable>column_definition</replaceable>
   | [CONSTRAINT [<replaceable>symbol</replaceable>]] PRIMARY KEY [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
   | {INDEX|KEY} [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
   | [CONSTRAINT [<replaceable>symbol</replaceable>]] UNIQUE [INDEX|KEY]

@@ -1641,7 +1640,7 @@
   | CHECK (<replaceable>expr</replaceable>)
 
 <replaceable>column_definition</replaceable>:
-    <replaceable>col_name</replaceable> <replaceable>data_type</replaceable> [NOT NULL | NULL] [DEFAULT <replaceable>default_value</replaceable>]
+    <replaceable>data_type</replaceable> [NOT NULL | NULL] [DEFAULT <replaceable>default_value</replaceable>]
       [AUTO_INCREMENT] [UNIQUE [KEY] | [PRIMARY] KEY]
       [COMMENT '<replaceable>string</replaceable>'] [<replaceable>reference_definition</replaceable>]
 


Modified: trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml	2007-10-03 16:50:40 UTC (rev 7954)
+++ trunk/refman-5.1/mysql-cluster-ccsg-merge-temp.xml	2007-10-03 16:51:03 UTC (rev 7955)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 666 bytes

@@ -2645,7 +2645,7 @@
           </para>
 
 <programlisting>
-CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>column_definitions</replaceable>) ENGINE=NDBCLUSTER;
+CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>col_name</replaceable> <replaceable>column_definitions</replaceable>) ENGINE=NDBCLUSTER;
 </programlisting>
 
           <para>


Modified: trunk/refman-5.1/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-multi-computer.xml	2007-10-03 16:50:40 UTC (rev 7954)
+++ trunk/refman-5.1/mysql-cluster-multi-computer.xml	2007-10-03 16:51:03 UTC (rev 7955)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 659 bytes

@@ -1273,7 +1273,7 @@
         </para>
 
 <programlisting>
-CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>column_definitions</replaceable>) ENGINE=NDBCLUSTER;
+CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>col_name</replaceable> <replaceable>column_definitions</replaceable>) ENGINE=NDBCLUSTER;
 </programlisting>
 
         <para>


Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2007-10-03 16:50:40 UTC (rev 7954)
+++ trunk/refman-5.1/sql-syntax.xml	2007-10-03 16:51:03 UTC (rev 7955)
Changed blocks: 6, Lines Added: 10, Lines Deleted: 11; 4534 bytes

@@ -344,8 +344,8 @@
 
 <replaceable>alter_specification</replaceable>:
     <replaceable>table_option</replaceable> ...
-  | ADD [COLUMN] <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable> ]
-  | ADD [COLUMN] (<replaceable>column_definition</replaceable>,...)
+  | ADD [COLUMN] <replaceable>col_name</replaceable> <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable> ]
+  | ADD [COLUMN] (<replaceable>col_name</replaceable> <replaceable>column_definition</replaceable>,...)
   | ADD {INDEX|KEY} [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
   | ADD [CONSTRAINT [<replaceable>symbol</replaceable>]]
         PRIMARY KEY [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)

@@ -358,9 +358,9 @@
         FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
         <replaceable>reference_definition</replaceable>
   | ALTER [COLUMN] <replaceable>col_name</replaceable> {SET DEFAULT <replaceable>literal</replaceable> | DROP DEFAULT}
-  | CHANGE [COLUMN] <replaceable>old_col_name</replaceable> <replaceable>column_definition</replaceable>
+  | CHANGE [COLUMN] <replaceable>old_col_name</replaceable> <replaceable>new_col_name</replaceable> <replaceable>column_definition</replaceable>
         [FIRST|AFTER <replaceable>col_name</replaceable>]
-  | MODIFY [COLUMN] <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable>]
+  | MODIFY [COLUMN] <replaceable>col_name</replaceable> <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable>]
   | DROP [COLUMN] <replaceable>col_name</replaceable>
   | DROP PRIMARY KEY
   | DROP {INDEX|KEY} <replaceable>index_name</replaceable>

@@ -801,9 +801,7 @@
             <replaceable>column_definition</replaceable> clauses use the
             same syntax for <literal>ADD</literal> and
             <literal>CHANGE</literal> as for <literal>CREATE
-            TABLE</literal>. Note that this syntax includes the column
-            name, not just its data type. See
-            <xref linkend="create-table"/>.
+            TABLE</literal>. See <xref linkend="create-table"/>.
           </para>
         </listitem>
 

@@ -811,10 +809,11 @@
           <para>
             You can rename a column using a <literal>CHANGE
             <replaceable>old_col_name</replaceable>
+            <replaceable>new_col_name</replaceable>
             <replaceable>column_definition</replaceable></literal>
             clause. To do so, specify the old and new column names and
-            the type that the column currently has. For example, to
-            rename an <literal>INTEGER</literal> column from
+            the definition that the column currently has. For example,
+            to rename an <literal>INTEGER</literal> column from
             <literal>a</literal> to <literal>b</literal>, you can do
             this:
           </para>

@@ -2690,7 +2689,7 @@
     { LIKE <replaceable>old_tbl_name</replaceable> | (LIKE <replaceable>old_tbl_name</replaceable>) }
 
 <replaceable>create_definition</replaceable>:
-    <replaceable>column_definition</replaceable>
+    <replaceable>col_name</replaceable> <replaceable>column_definition</replaceable>
   | [CONSTRAINT [<replaceable>symbol</replaceable>]] PRIMARY KEY [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
       [<replaceable>index_option</replaceable> ...]
   | {INDEX|KEY} [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)

@@ -2705,7 +2704,7 @@
   | CHECK (<replaceable>expr</replaceable>)
 
 <replaceable>column_definition</replaceable>:
-    <replaceable>col_name</replaceable> <replaceable>data_type</replaceable> [NOT NULL | NULL] [DEFAULT <replaceable>default_value</replaceable>]
+    <replaceable>data_type</replaceable> [NOT NULL | NULL] [DEFAULT <replaceable>default_value</replaceable>]
       [AUTO_INCREMENT] [UNIQUE [KEY] | [PRIMARY] KEY]
       [COMMENT '<replaceable>string</replaceable>'] [<replaceable>reference_definition</replaceable>]
       [COLUMN_FORMAT {FIXED|DYNAMIC|DEFAULT}]


Modified: trunk/refman-5.2/mysql-cluster-multi-computer.xml
===================================================================
--- trunk/refman-5.2/mysql-cluster-multi-computer.xml	2007-10-03 16:50:40 UTC (rev 7954)
+++ trunk/refman-5.2/mysql-cluster-multi-computer.xml	2007-10-03 16:51:03 UTC (rev 7955)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 659 bytes

@@ -1249,7 +1249,7 @@
         </para>
 
 <programlisting>
-CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>column_definitions</replaceable>) ENGINE=NDBCLUSTER;
+CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>col_name</replaceable> <replaceable>column_definitions</replaceable>) ENGINE=NDBCLUSTER;
 </programlisting>
 
         <para>


Modified: trunk/refman-5.2/sql-syntax.xml
===================================================================
--- trunk/refman-5.2/sql-syntax.xml	2007-10-03 16:50:40 UTC (rev 7954)
+++ trunk/refman-5.2/sql-syntax.xml	2007-10-03 16:51:03 UTC (rev 7955)
Changed blocks: 6, Lines Added: 10, Lines Deleted: 11; 4534 bytes

@@ -344,8 +344,8 @@
 
 <replaceable>alter_specification</replaceable>:
     <replaceable>table_option</replaceable> ...
-  | ADD [COLUMN] <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable> ]
-  | ADD [COLUMN] (<replaceable>column_definition</replaceable>,...)
+  | ADD [COLUMN] <replaceable>col_name</replaceable> <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable> ]
+  | ADD [COLUMN] (<replaceable>col_name</replaceable> <replaceable>column_definition</replaceable>,...)
   | ADD {INDEX|KEY} [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
   | ADD [CONSTRAINT [<replaceable>symbol</replaceable>]]
         PRIMARY KEY [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)

@@ -358,9 +358,9 @@
         FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
         <replaceable>reference_definition</replaceable>
   | ALTER [COLUMN] <replaceable>col_name</replaceable> {SET DEFAULT <replaceable>literal</replaceable> | DROP DEFAULT}
-  | CHANGE [COLUMN] <replaceable>old_col_name</replaceable> <replaceable>column_definition</replaceable>
+  | CHANGE [COLUMN] <replaceable>old_col_name</replaceable> <replaceable>new_col_name</replaceable> <replaceable>column_definition</replaceable>
         [FIRST|AFTER <replaceable>col_name</replaceable>]
-  | MODIFY [COLUMN] <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable>]
+  | MODIFY [COLUMN] <replaceable>col_name</replaceable> <replaceable>column_definition</replaceable> [FIRST | AFTER <replaceable>col_name</replaceable>]
   | DROP [COLUMN] <replaceable>col_name</replaceable>
   | DROP PRIMARY KEY
   | DROP {INDEX|KEY} <replaceable>index_name</replaceable>

@@ -805,9 +805,7 @@
             <replaceable>column_definition</replaceable> clauses use the
             same syntax for <literal>ADD</literal> and
             <literal>CHANGE</literal> as for <literal>CREATE
-            TABLE</literal>. Note that this syntax includes the column
-            name, not just its data type. See
-            <xref linkend="create-table"/>.
+            TABLE</literal>. See <xref linkend="create-table"/>.
           </para>
         </listitem>
 

@@ -815,10 +813,11 @@
           <para>
             You can rename a column using a <literal>CHANGE
             <replaceable>old_col_name</replaceable>
+            <replaceable>new_col_name</replaceable>
             <replaceable>column_definition</replaceable></literal>
             clause. To do so, specify the old and new column names and
-            the type that the column currently has. For example, to
-            rename an <literal>INTEGER</literal> column from
+            the definition that the column currently has. For example,
+            to rename an <literal>INTEGER</literal> column from
             <literal>a</literal> to <literal>b</literal>, you can do
             this:
           </para>

@@ -2697,7 +2696,7 @@
     { LIKE <replaceable>old_tbl_name</replaceable> | (LIKE <replaceable>old_tbl_name</replaceable>) }
 
 <replaceable>create_definition</replaceable>:
-    <replaceable>column_definition</replaceable>
+    <replaceable>col_name</replaceable> <replaceable>column_definition</replaceable>
   | [CONSTRAINT [<replaceable>symbol</replaceable>]] PRIMARY KEY [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
       [<replaceable>index_option</replaceable> ...]
   | {INDEX|KEY} [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)

@@ -2712,7 +2711,7 @@
   | CHECK (<replaceable>expr</replaceable>)
 
 <replaceable>column_definition</replaceable>:
-    <replaceable>col_name</replaceable> <replaceable>data_type</replaceable> [NOT NULL | NULL] [DEFAULT <replaceable>default_value</replaceable>]
+    <replaceable>data_type</replaceable> [NOT NULL | NULL] [DEFAULT <replaceable>default_value</replaceable>]
       [AUTO_INCREMENT] [UNIQUE [KEY] | [PRIMARY] KEY]
       [COMMENT '<replaceable>string</replaceable>'] [<replaceable>reference_definition</replaceable>]
       [COLUMN_FORMAT {FIXED|DYNAMIC|DEFAULT}]


Thread
svn commit - mysqldoc@docsrva: r7955 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.2paul3 Oct