svn commit - mysqldoc@docsrva: r10261 - in trunk: refman-4.1 refman-5.0 refman-5.1 refman-6.0

[jon]

Author: jstephens
Date: 2008-03-15 21:53:19 +0100 (Sat, 15 Mar 2008)
New Revision: 10261

Log:

Added links to SHOW CHARACTER SET and SHOW COLLATION from ALTER DATABASE

(semi-inspired by user comment)



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


Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml	2008-03-15 13:37:09 UTC (rev 10260)
+++ trunk/refman-4.1/sql-syntax.xml	2008-03-15 20:53:19 UTC (rev 10261)
Changed blocks: 2, Lines Added: 19, Lines Deleted: 11; 1583 bytes

@@ -71,6 +71,25 @@
         names.
       </para>
 
+      <para>
+        Beginning with MySQL 4.1.0, you can see what character sets and
+        collations are available using, respectively, the <literal>SHOW
+        CHARACTER SET</literal> and <literal>SHOW COLLATION</literal>
+        statements. See <xref linkend="show-character-set"/>, and
+        <xref linkend="show-collation"/>, for more information.
+      </para>
+
+      <remark>
+        It is really 4.1.0, but with a different syntax than in 4.1.1.
+        (COLLATE is not supported.)
+      </remark>
+
+      <para>
+        <literal>ALTER DATABASE</literal> was added in MySQL 4.1.1.
+        Beginning with MySQL 4.1.8, the database name can be omitted, in
+        which case the statement applies to the default database.
+      </para>
+
       <remark role="help-description-end"/>
 
       <formalpara role="mnmas">

@@ -88,17 +107,6 @@
 
       </formalpara>
 
-      <remark>
-        It is really 4.1.0, but with a different syntax than in 4.1.1.
-        (COLLATE is not supported.)
-      </remark>
-
-      <para>
-        <literal>ALTER DATABASE</literal> was added in MySQL 4.1.1.
-        Beginning with MySQL 4.1.8, the database name can be omitted, in
-        which case the statement applies to the default database.
-      </para>
-
     </section>
 
     <section id="alter-table">


Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml	2008-03-15 13:37:09 UTC (rev 10260)
+++ trunk/refman-5.0/sql-syntax.xml	2008-03-15 20:53:19 UTC (rev 10261)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 0; 767 bytes

@@ -113,6 +113,14 @@
       </para>
 
       <para>
+        You can see what character sets and collations are available
+        using, respectively, the <literal>SHOW CHARACTER SET</literal>
+        and <literal>SHOW COLLATION</literal> statements. See
+        <xref linkend="show-character-set"/>, and
+        <xref linkend="show-collation"/>, for more information.
+      </para>
+
+      <para>
         The database name can be omitted, in which case the statement
         applies to the default database.
       </para>


Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2008-03-15 13:37:09 UTC (rev 10260)
+++ trunk/refman-5.1/sql-syntax.xml	2008-03-15 20:53:19 UTC (rev 10261)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 0; 789 bytes

@@ -123,6 +123,14 @@
       </para>
 
       <para>
+        You can see what character sets and collations are available
+        using, respectively, the <literal>SHOW CHARACTER SET</literal>
+        and <literal>SHOW COLLATION</literal> statements. See
+        <xref linkend="show-character-set"/>, and
+        <xref linkend="show-collation"/>, for more information.
+      </para>
+
+      <para>
         The database name can be omitted from the first syntax, in which
         case the statement applies to the default database.
       </para>


Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml	2008-03-15 13:37:09 UTC (rev 10260)
+++ trunk/refman-6.0/sql-syntax.xml	2008-03-15 20:53:19 UTC (rev 10261)
Changed blocks: 1, Lines Added: 8, Lines Deleted: 0; 789 bytes

@@ -123,6 +123,14 @@
       </para>
 
       <para>
+        You can see what character sets and collations are available
+        using, respectively, the <literal>SHOW CHARACTER SET</literal>
+        and <literal>SHOW COLLATION</literal> statements. See
+        <xref linkend="show-character-set"/>, and
+        <xref linkend="show-collation"/>, for more information.
+      </para>
+
+      <para>
         The database name can be omitted from the first syntax, in which
         case the statement applies to the default database.
       </para>