List:Commits« Previous MessageNext Message »
From:paul Date:January 26 2006 12:21am
Subject:svn commit - mysqldoc@docsrva: r1039 - in trunk: . refman-4.1 refman-5.0 refman-5.1
View as plain text  
Author: paul
Date: 2006-01-26 01:21:25 +0100 (Thu, 26 Jan 2006)
New Revision: 1039

Log:
 r6685@frost:  paul | 2006-01-25 18:19:21 -0600
 General revisions.


Modified:
   trunk/
   trunk/refman-4.1/sql-syntax.xml
   trunk/refman-5.0/sql-syntax.xml
   trunk/refman-5.1/sql-syntax.xml


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

Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2006-01-25 21:20:57 UTC (rev 1038)
+++ trunk/refman-4.1/sql-syntax.xml	2006-01-26 00:21:25 UTC (rev 1039)
@@ -262,7 +262,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 DROP COLUMN c, DROP COLUMN d;</userinput>
+ALTER TABLE t2 DROP COLUMN c, DROP COLUMN d;
 </programlisting>
         </listitem>
 
@@ -285,8 +285,8 @@
 
         <listitem>
           <para>
-            The word <literal>COLUMN</literal> is purely optional and
-            can be omitted.
+            The word <literal>COLUMN</literal> is optional and can be
+            omitted.
           </para>
         </listitem>
 
@@ -327,7 +327,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t1 CHANGE a b INTEGER;</userinput>
+ALTER TABLE t1 CHANGE a b INTEGER;
 </programlisting>
 
           <para>
@@ -337,7 +337,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t1 CHANGE b b BIGINT NOT NULL;</userinput>
+ALTER TABLE t1 CHANGE b b BIGINT NOT NULL;
 </programlisting>
 
           <para>
@@ -347,7 +347,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t1 MODIFY b BIGINT NOT NULL;</userinput>
+ALTER TABLE t1 MODIFY b BIGINT NOT NULL;
 </programlisting>
         </listitem>
 
@@ -371,14 +371,14 @@
 
         <listitem>
           <para>
-            In MySQL 3.22 or later, you can use <literal>FIRST</literal>
-            or <literal>AFTER
-            <replaceable>col_name</replaceable></literal> to add a
-            column at a specific position within a table row. The
-            default is to add the column last. From MySQL 4.0.1 on, you
-            can also use <literal>FIRST</literal> and
-            <literal>AFTER</literal> in <literal>CHANGE</literal> or
-            <literal>MODIFY</literal> operations.
+            In MySQL 3.22 or later, to add a column at a specific
+            position within a table row, use <literal>FIRST</literal> or
+            <literal>AFTER
+            <replaceable>col_name</replaceable></literal>. The default
+            is to add the column last. From MySQL 4.0.1 on, you can also
+            use <literal>FIRST</literal> and <literal>AFTER</literal> in
+            <literal>CHANGE</literal> or <literal>MODIFY</literal>
+            operations.
           </para>
         </listitem>
 
@@ -408,8 +408,9 @@
               <secondary>changing</secondary>
             </indexterm>
 
-            <literal>ALTER COLUMN</literal> specifies a new default
-            value for a column or removes the old default value. If the
+            <literal>ALTER ... SET DEFAULT</literal> or <literal>ALTER
+            ... DROP DEFAULT</literal> specify a new default value for a
+            column or remove the old default value, respectively. If the
             old default is removed and the column can be
             <literal>NULL</literal>, the new default is
             <literal>NULL</literal>. If the column cannot be
@@ -507,12 +508,12 @@
             <literal>ORDER BY</literal> enables you to create the new
             table with the rows in a specific order. Note that the table
             does not remain in this order after inserts and deletes.
-            This option is mainly useful when you know that you are
-            mostly going to query the rows in a certain order; by using
-            this option after major changes to the table, you might be
-            able to get higher performance. In some cases, it might make
-            sorting easier for MySQL if the table is in order by the
-            column that you want to order it by later.
+            This option is useful primarily when you know that you are
+            mostly to query the rows in a certain order most of the
+            time. By using this option after major changes to the table,
+            you might be able to get higher performance. In some cases,
+            it might make sorting easier for MySQL if the table is in
+            order by the column that you want to order it by later.
           </para>
         </listitem>
 
@@ -753,21 +754,19 @@
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            <indexterm type="function">
-              <primary>mysql_info()</primary>
-            </indexterm>
+      </itemizedlist>
 
-            With the <literal>mysql_info()</literal> C API function, you
-            can find out how many rows were copied, and (when
-            <literal>IGNORE</literal> is used) how many rows were
-            deleted due to duplication of unique key values. See
-            <xref linkend="mysql-info"/>.
-          </para>
-        </listitem>
+      <indexterm type="function">
+        <primary>mysql_info()</primary>
+      </indexterm>
 
-      </itemizedlist>
+      <para>
+        With the <literal>mysql_info()</literal> C API function, you can
+        find out how many rows were copied, and (when
+        <literal>IGNORE</literal> is used) how many rows were deleted
+        due to duplication of unique key values. See
+        <xref linkend="mysql-info"/>.
+      </para>
 
       <para>
         Here are some examples that show uses of <literal>ALTER
@@ -776,7 +775,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>CREATE TABLE t1 (a INTEGER,b CHAR(10));</userinput>
+CREATE TABLE t1 (a INTEGER,b CHAR(10));
 </programlisting>
 
       <para>
@@ -785,7 +784,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t1 RENAME t2;</userinput>
+ALTER TABLE t1 RENAME t2;
 </programlisting>
 
       <para>
@@ -798,7 +797,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 MODIFY a TINYINT NOT NULL, CHANGE b c CHAR(20);</userinput>
+ALTER TABLE t2 MODIFY a TINYINT NOT NULL, CHANGE b c CHAR(20);
 </programlisting>
 
       <para>
@@ -807,7 +806,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 ADD d TIMESTAMP;</userinput>
+ALTER TABLE t2 ADD d TIMESTAMP;
 </programlisting>
 
       <para>
@@ -816,7 +815,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 ADD INDEX (d), ADD INDEX (a);</userinput>
+ALTER TABLE t2 ADD INDEX (d), ADD INDEX (a);
 </programlisting>
 
       <para>
@@ -824,7 +823,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 DROP COLUMN c;</userinput>
+ALTER TABLE t2 DROP COLUMN c;
 </programlisting>
 
       <para>
@@ -833,8 +832,8 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 ADD c INT UNSIGNED NOT NULL AUTO_INCREMENT,</userinput>
-    -&gt;     <userinput>ADD PRIMARY KEY (c);</userinput>
+ALTER TABLE t2 ADD c INT UNSIGNED NOT NULL AUTO_INCREMENT,
+  ADD PRIMARY KEY (c);
 </programlisting>
 
       <para>
@@ -876,7 +875,7 @@
       </para>
 
       <para>
-        See <xref linkend="alter-table-problems"/>.
+        See also <xref linkend="alter-table-problems"/>.
       </para>
 
     </section>
@@ -933,14 +932,15 @@
       </para>
 
       <para>
-        As of MySQL 4.1.1, <literal>create_specification</literal>
-        options can be given to specify database characteristics.
-        Database characteristics are stored in the
-        <filename>db.opt</filename> file in the database directory. The
-        <literal>CHARACTER SET</literal> clause specifies the default
-        database character set. The <literal>COLLATE</literal> clause
-        specifies the default database collation. Character set and
-        collation names are discussed in <xref linkend="charset"/>.
+        As of MySQL 4.1.1,
+        <replaceable>create_specification</replaceable> options specify
+        database characteristics. Database characteristics are stored in
+        the <filename>db.opt</filename> file in the database directory.
+        The <literal>CHARACTER SET</literal> clause specifies the
+        default database character set. The <literal>COLLATE</literal>
+        clause specifies the default database collation.
+        <xref linkend="charset"/>, discusses character set and collation
+        names.
       </para>
 
       <para>

Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2006-01-25 21:20:57 UTC (rev 1038)
+++ trunk/refman-5.0/sql-syntax.xml	2006-01-26 00:21:25 UTC (rev 1039)
@@ -305,7 +305,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 DROP COLUMN c, DROP COLUMN d;</userinput>
+ALTER TABLE t2 DROP COLUMN c, DROP COLUMN d;
 </programlisting>
         </listitem>
 
@@ -328,8 +328,8 @@
 
         <listitem>
           <para>
-            The word <literal>COLUMN</literal> is purely optional and
-            can be omitted.
+            The word <literal>COLUMN</literal> is optional and can be
+            omitted.
           </para>
         </listitem>
 
@@ -370,7 +370,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t1 CHANGE a b INTEGER;</userinput>
+ALTER TABLE t1 CHANGE a b INTEGER;
 </programlisting>
 
           <para>
@@ -380,7 +380,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t1 CHANGE b b BIGINT NOT NULL;</userinput>
+ALTER TABLE t1 CHANGE b b BIGINT NOT NULL;
 </programlisting>
 
           <para>
@@ -389,7 +389,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t1 MODIFY b BIGINT NOT NULL;</userinput>
+ALTER TABLE t1 MODIFY b BIGINT NOT NULL;
 </programlisting>
         </listitem>
 
@@ -413,10 +413,10 @@
 
         <listitem>
           <para>
-            You can use <literal>FIRST</literal> or <literal>AFTER
-            <replaceable>col_name</replaceable></literal> to add a
-            column at a specific position within a table row. The
-            default is to add the column last. You can also use
+            To add a column at a specific position within a table row,
+            use <literal>FIRST</literal> or <literal>AFTER
+            <replaceable>col_name</replaceable></literal>. The default
+            is to add the column last. You can also use
             <literal>FIRST</literal> and <literal>AFTER</literal> in
             <literal>CHANGE</literal> or <literal>MODIFY</literal>
             operations.
@@ -449,8 +449,9 @@
               <secondary>changing</secondary>
             </indexterm>
 
-            <literal>ALTER COLUMN</literal> specifies a new default
-            value for a column or removes the old default value. If the
+            <literal>ALTER ... SET DEFAULT</literal> or <literal>ALTER
+            ... DROP DEFAULT</literal> specify a new default value for a
+            column or remove the old default value, respectively. If the
             old default is removed and the column can be
             <literal>NULL</literal>, the new default is
             <literal>NULL</literal>. If the column cannot be
@@ -520,7 +521,7 @@
             would drop the first <literal>UNIQUE</literal> index in the
             table. This is not the case in MySQL &current-series;, where
             trying to use <literal>DROP PRIMARY KEY</literal> on a table
-            with no primary key will give rise to an error.
+            with no primary key give rises to an error.
           </para>
 
           <indexterm type="function">
@@ -548,12 +549,12 @@
             <literal>ORDER BY</literal> enables you to create the new
             table with the rows in a specific order. Note that the table
             does not remain in this order after inserts and deletes.
-            This option is mainly useful when you know that you are
-            mostly going to query the rows in a certain order; by using
-            this option after major changes to the table, you might be
-            able to get higher performance. In some cases, it might make
-            sorting easier for MySQL if the table is in order by the
-            column that you want to order it by later.
+            This option is useful primarily when you know that you are
+            mostly to query the rows in a certain order most of the
+            time. By using this option after major changes to the table,
+            you might be able to get higher performance. In some cases,
+            it might make sorting easier for MySQL if the table is in
+            order by the column that you want to order it by later.
           </para>
         </listitem>
 
@@ -772,21 +773,19 @@
           </para>
         </listitem>
 
-        <listitem>
-          <para>
-            <indexterm type="function">
-              <primary>mysql_info()</primary>
-            </indexterm>
+      </itemizedlist>
 
-            With the <literal>mysql_info()</literal> C API function, you
-            can find out how many rows were copied, and (when
-            <literal>IGNORE</literal> is used) how many rows were
-            deleted due to duplication of unique key values. See
-            <xref linkend="mysql-info"/>.
-          </para>
-        </listitem>
+      <indexterm type="function">
+        <primary>mysql_info()</primary>
+      </indexterm>
 
-      </itemizedlist>
+      <para>
+        With the <literal>mysql_info()</literal> C API function, you can
+        find out how many rows were copied, and (when
+        <literal>IGNORE</literal> is used) how many rows were deleted
+        due to duplication of unique key values. See
+        <xref linkend="mysql-info"/>.
+      </para>
 
       <para>
         Here are some examples that show uses of <literal>ALTER
@@ -795,7 +794,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>CREATE TABLE t1 (a INTEGER,b CHAR(10));</userinput>
+CREATE TABLE t1 (a INTEGER,b CHAR(10));
 </programlisting>
 
       <para>
@@ -804,7 +803,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t1 RENAME t2;</userinput>
+ALTER TABLE t1 RENAME t2;
 </programlisting>
 
       <para>
@@ -817,7 +816,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 MODIFY a TINYINT NOT NULL, CHANGE b c CHAR(20);</userinput>
+ALTER TABLE t2 MODIFY a TINYINT NOT NULL, CHANGE b c CHAR(20);
 </programlisting>
 
       <para>
@@ -826,7 +825,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 ADD d TIMESTAMP;</userinput>
+ALTER TABLE t2 ADD d TIMESTAMP;
 </programlisting>
 
       <para>
@@ -835,7 +834,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 ADD INDEX (d), ADD INDEX (a);</userinput>
+ALTER TABLE t2 ADD INDEX (d), ADD INDEX (a);
 </programlisting>
 
       <para>
@@ -843,7 +842,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 DROP COLUMN c;</userinput>
+ALTER TABLE t2 DROP COLUMN c;
 </programlisting>
 
       <para>
@@ -852,8 +851,8 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 ADD c INT UNSIGNED NOT NULL AUTO_INCREMENT,</userinput>
-    -&gt;     <userinput>ADD PRIMARY KEY (c);</userinput>
+ALTER TABLE t2 ADD c INT UNSIGNED NOT NULL AUTO_INCREMENT,
+  ADD PRIMARY KEY (c);
 </programlisting>
 
       <para>
@@ -895,7 +894,7 @@
       </para>
 
       <para>
-        See <xref linkend="alter-table-problems"/>.
+        See also <xref linkend="alter-table-problems"/>.
       </para>
 
     </section>
@@ -955,6 +954,8 @@
         <literal>CREATE DATABASE</literal> creates a database with the
         given name. To use <literal>CREATE DATABASE</literal>, you need
         the <literal>CREATE</literal> privilege on the database.
+        <literal>CREATE SCHEMA</literal> is a synonym for
+        <literal>CREATE DATABASE</literal> as of MySQL 5.0.2.
       </para>
 
       <remark role="help-description-end"/>
@@ -966,13 +967,14 @@
       </para>
 
       <para>
-        <literal>create_specification</literal> options specify database
-        characteristics. Database characteristics are stored in the
-        <filename>db.opt</filename> file in the database directory. The
-        <literal>CHARACTER SET</literal> clause specifies the default
-        database character set. The <literal>COLLATE</literal> clause
-        specifies the default database collation. Character set and
-        collation names are discussed in <xref linkend="charset"/>.
+        <replaceable>create_specification</replaceable> options specify
+        database characteristics. Database characteristics are stored in
+        the <filename>db.opt</filename> file in the database directory.
+        The <literal>CHARACTER SET</literal> clause specifies the
+        default database character set. The <literal>COLLATE</literal>
+        clause specifies the default database collation.
+        <xref linkend="charset"/>, discusses character set and collation
+        names.
       </para>
 
       <para>
@@ -991,10 +993,6 @@
         <literal>SHOW DATABASES</literal>.
       </para>
 
-      <para>
-        <literal>CREATE SCHEMA</literal> can be used as of MySQL 5.0.2.
-      </para>
-
       <indexterm>
         <primary><command>mysqladmin</command></primary>
       </indexterm>

Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2006-01-25 21:20:57 UTC (rev 1038)
+++ trunk/refman-5.1/sql-syntax.xml	2006-01-26 00:21:25 UTC (rev 1039)
@@ -303,7 +303,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 DROP COLUMN c, DROP COLUMN d;</userinput>
+ALTER TABLE t2 DROP COLUMN c, DROP COLUMN d;
 </programlisting>
         </listitem>
 
@@ -326,8 +326,8 @@
 
         <listitem>
           <para>
-            The word <literal>COLUMN</literal> is purely optional and
-            can be omitted.
+            The word <literal>COLUMN</literal> is optional and can be
+            omitted.
           </para>
         </listitem>
 
@@ -368,7 +368,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t1 CHANGE a b INTEGER;</userinput>
+ALTER TABLE t1 CHANGE a b INTEGER;
 </programlisting>
 
           <para>
@@ -378,7 +378,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t1 CHANGE b b BIGINT NOT NULL;</userinput>
+ALTER TABLE t1 CHANGE b b BIGINT NOT NULL;
 </programlisting>
 
           <para>
@@ -387,7 +387,7 @@
           </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t1 MODIFY b BIGINT NOT NULL;</userinput>
+ALTER TABLE t1 MODIFY b BIGINT NOT NULL;
 </programlisting>
         </listitem>
 
@@ -411,10 +411,10 @@
 
         <listitem>
           <para>
-            You can use <literal>FIRST</literal> or <literal>AFTER
-            <replaceable>col_name</replaceable></literal> to add a
-            column at a specific position within a table row. The
-            default is to add the column last. You can also use
+            To add a column at a specific position within a table row,
+            use <literal>FIRST</literal> or <literal>AFTER
+            <replaceable>col_name</replaceable></literal>. The default
+            is to add the column last. You can also use
             <literal>FIRST</literal> and <literal>AFTER</literal> in
             <literal>CHANGE</literal> or <literal>MODIFY</literal>
             operations.
@@ -447,8 +447,9 @@
               <secondary>changing</secondary>
             </indexterm>
 
-            <literal>ALTER COLUMN</literal> specifies a new default
-            value for a column or removes the old default value. If the
+            <literal>ALTER ... SET DEFAULT</literal> or <literal>ALTER
+            ... DROP DEFAULT</literal> specify a new default value for a
+            column or remove the old default value, respectively. If the
             old default is removed and the column can be
             <literal>NULL</literal>, the new default is
             <literal>NULL</literal>. If the column cannot be
@@ -518,7 +519,7 @@
             would drop the first <literal>UNIQUE</literal> index in the
             table. This is not the case in MySQL &current-series;, where
             trying to use <literal>DROP PRIMARY KEY</literal> on a table
-            with no primary key will give rise to an error.
+            with no primary key give rises to an error.
           </para>
 
           <indexterm type="function">
@@ -546,12 +547,12 @@
             <literal>ORDER BY</literal> enables you to create the new
             table with the rows in a specific order. Note that the table
             does not remain in this order after inserts and deletes.
-            This option is mainly useful when you know that you are
-            mostly going to query the rows in a certain order; by using
-            this option after major changes to the table, you might be
-            able to get higher performance. In some cases, it might make
-            sorting easier for MySQL if the table is in order by the
-            column that you want to order it by later.
+            This option is useful primarily when you know that you are
+            mostly to query the rows in a certain order most of the
+            time. By using this option after major changes to the table,
+            you might be able to get higher performance. In some cases,
+            it might make sorting easier for MySQL if the table is in
+            order by the column that you want to order it by later.
           </para>
         </listitem>
 
@@ -772,20 +773,6 @@
 
         <listitem>
           <para>
-            <indexterm type="function">
-              <primary>mysql_info()</primary>
-            </indexterm>
-
-            With the <literal>mysql_info()</literal> C API function, you
-            can find out how many rows were copied, and (when
-            <literal>IGNORE</literal> is used) how many rows were
-            deleted due to duplication of unique key values. See
-            <xref linkend="mysql-info"/>.
-          </para>
-        </listitem>
-
-        <listitem>
-          <para>
             <literal>ALTER TABLE</literal> can also be used with
             partitioned tables for repartitioning, for adding, dropping,
             merging, and splitting partitions, and for performing
@@ -890,7 +877,8 @@
             table that is partitioned by <literal>HASH</literal> or
             <literal>KEY</literal> to reduce the number of partitions by
             <replaceable>number</replaceable>. Suppose that you have
-            created table <literal>t2</literal> using the following:
+            created table <literal>t2</literal> using the following
+            definition:
           </para>
 
 <programlisting>
@@ -917,9 +905,7 @@
             <replaceable>number</replaceable> partitions will be merged
             into the remaining partitions. In this case, partitions 4
             and 5 will be merged into the first 4 partitions (the
-            partitions numbered <literal>0</literal>,
-            <literal>1</literal>, <literal>2</literal>, and
-            <literal>3</literal>).
+            partitions numbered 0, 1, 2, and 3.
           </para>
 
           <para>
@@ -988,24 +974,36 @@
             PARTITION</literal>, <literal>REBUILD PARTITION</literal>,
             and <literal>REPAIR PARTITION</literal>. Each of these
             options takes a <replaceable>partition_names</replaceable>
-            clause consisting of one or more names of partitions. The
-            partitions must already exist in the table to be altered.
-            Multiple partition names are separated by commas. For more
-            information, and for examples of these, see
+            clause consisting of one or more names of partitions,
+            separated by commas. The partitions must already exist in
+            the table to be altered. For more information, and for
+            examples of these, see
             <xref linkend="partitioning-maintenance"/>.
           </para>
         </listitem>
 
       </itemizedlist>
 
+      <indexterm type="function">
+        <primary>mysql_info()</primary>
+      </indexterm>
+
       <para>
+        With the <literal>mysql_info()</literal> C API function, you can
+        find out how many rows were copied, and (when
+        <literal>IGNORE</literal> is used) how many rows were deleted
+        due to duplication of unique key values. See
+        <xref linkend="mysql-info"/>.
+      </para>
+
+      <para>
         Here are some examples that show uses of <literal>ALTER
         TABLE</literal>. Begin with a table <literal>t1</literal> that
         is created as shown here:
       </para>
 
 <programlisting>
-mysql&gt; <userinput>CREATE TABLE t1 (a INTEGER,b CHAR(10));</userinput>
+CREATE TABLE t1 (a INTEGER,b CHAR(10));
 </programlisting>
 
       <para>
@@ -1014,7 +1012,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t1 RENAME t2;</userinput>
+ALTER TABLE t1 RENAME t2;
 </programlisting>
 
       <para>
@@ -1027,7 +1025,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 MODIFY a TINYINT NOT NULL, CHANGE b c CHAR(20);</userinput>
+ALTER TABLE t2 MODIFY a TINYINT NOT NULL, CHANGE b c CHAR(20);
 </programlisting>
 
       <para>
@@ -1036,7 +1034,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 ADD d TIMESTAMP;</userinput>
+ALTER TABLE t2 ADD d TIMESTAMP;
 </programlisting>
 
       <para>
@@ -1045,7 +1043,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 ADD INDEX (d), ADD INDEX (a);</userinput>
+ALTER TABLE t2 ADD INDEX (d), ADD INDEX (a);
 </programlisting>
 
       <para>
@@ -1053,7 +1051,7 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 DROP COLUMN c;</userinput>
+ALTER TABLE t2 DROP COLUMN c;
 </programlisting>
 
       <para>
@@ -1062,8 +1060,8 @@
       </para>
 
 <programlisting>
-mysql&gt; <userinput>ALTER TABLE t2 ADD c INT UNSIGNED NOT NULL AUTO_INCREMENT,</userinput>
-    -&gt;     <userinput>ADD PRIMARY KEY (c);</userinput>
+ALTER TABLE t2 ADD c INT UNSIGNED NOT NULL AUTO_INCREMENT,
+  ADD PRIMARY KEY (c);
 </programlisting>
 
       <para>
@@ -1105,7 +1103,7 @@
       </para>
 
       <para>
-        See <xref linkend="alter-table-problems"/>.
+        See also <xref linkend="alter-table-problems"/>.
       </para>
 
     </section>
@@ -1165,6 +1163,8 @@
         <literal>CREATE DATABASE</literal> creates a database with the
         given name. To use <literal>CREATE DATABASE</literal>, you need
         the <literal>CREATE</literal> privilege on the database.
+        <literal>CREATE SCHEMA</literal> is a synonym for
+        <literal>CREATE DATABASE</literal>.
       </para>
 
       <remark role="help-description-end"/>
@@ -1176,13 +1176,14 @@
       </para>
 
       <para>
-        <literal>create_specification</literal> options specify database
-        characteristics. Database characteristics are stored in the
-        <filename>db.opt</filename> file in the database directory. The
-        <literal>CHARACTER SET</literal> clause specifies the default
-        database character set. The <literal>COLLATE</literal> clause
-        specifies the default database collation. Character set and
-        collation names are discussed in <xref linkend="charset"/>.
+        <replaceable>create_specification</replaceable> options specify
+        database characteristics. Database characteristics are stored in
+        the <filename>db.opt</filename> file in the database directory.
+        The <literal>CHARACTER SET</literal> clause specifies the
+        default database character set. The <literal>COLLATE</literal>
+        clause specifies the default database collation.
+        <xref linkend="charset"/>, discusses character set and collation
+        names.
       </para>
 
       <para>
@@ -1201,10 +1202,6 @@
         <literal>SHOW DATABASES</literal>.
       </para>
 
-      <para>
-        <literal>CREATE SCHEMA</literal> can also be used.
-      </para>
-
       <indexterm>
         <primary><command>mysqladmin</command></primary>
       </indexterm>

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