Author: paul
Date: 2006-01-14 00:47:16 +0100 (Sat, 14 Jan 2006)
New Revision: 819
Log:
r6185@frost: paul | 2006-01-13 17:45:30 -0600
We were missing a rule for charset/collation assignment.
Add missing brackets in syntax.
Modified:
trunk/
trunk/refman-4.1/charset.xml
trunk/refman-5.0/charset.xml
trunk/refman-5.1/charset.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6161
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2175
+ b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:6185
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:2175
Modified: trunk/refman-4.1/charset.xml
===================================================================
--- trunk/refman-4.1/charset.xml 2006-01-13 22:55:08 UTC (rev 818)
+++ trunk/refman-4.1/charset.xml 2006-01-13 23:47:16 UTC (rev 819)
@@ -531,6 +531,16 @@
<listitem>
<para>
+ If <literal>COLLATE <replaceable>Y</replaceable></literal>
+ was specified without <literal>CHARACTER SET</literal>, then
+ the character set associated with
+ <replaceable>Y</replaceable> and collation
+ <replaceable>Y</replaceable>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Otherwise, the server character set and server collation.
</para>
</listitem>
@@ -580,10 +590,10 @@
<programlisting>
CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>column_list</replaceable>)
- [DEFAULT CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]]
+ [[DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATE <replaceable>collation_name</replaceable>]]
ALTER TABLE <replaceable>tbl_name</replaceable>
- [DEFAULT CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATE <replaceable>collation_name</replaceable>]
+ [[DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATE <replaceable>collation_name</replaceable>]
</programlisting>
<para>
@@ -623,6 +633,16 @@
<listitem>
<para>
+ If <literal>COLLATE <replaceable>Y</replaceable></literal>
+ was specified without <literal>CHARACTER SET</literal>, then
+ the character set associated with
+ <replaceable>Y</replaceable> and collation
+ <replaceable>Y</replaceable>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Otherwise, the database character set and collation.
</para>
</listitem>
@@ -697,6 +717,16 @@
<listitem>
<para>
+ If <literal>COLLATE <replaceable>Y</replaceable></literal>
+ was specified without <literal>CHARACTER SET</literal>, then
+ the character set associated with
+ <replaceable>Y</replaceable> and collation
+ <replaceable>Y</replaceable>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Otherwise, the table character set and collation are used.
</para>
</listitem>
Modified: trunk/refman-5.0/charset.xml
===================================================================
--- trunk/refman-5.0/charset.xml 2006-01-13 22:55:08 UTC (rev 818)
+++ trunk/refman-5.0/charset.xml 2006-01-13 23:47:16 UTC (rev 819)
@@ -527,6 +527,16 @@
<listitem>
<para>
+ If <literal>COLLATE <replaceable>Y</replaceable></literal>
+ was specified without <literal>CHARACTER SET</literal>, then
+ the character set associated with
+ <replaceable>Y</replaceable> and collation
+ <replaceable>Y</replaceable>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Otherwise, the server character set and server collation.
</para>
</listitem>
@@ -576,10 +586,10 @@
<programlisting>
CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>column_list</replaceable>)
- [DEFAULT CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]]
+ [[DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATE <replaceable>collation_name</replaceable>]]
ALTER TABLE <replaceable>tbl_name</replaceable>
- [DEFAULT CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATE <replaceable>collation_name</replaceable>]
+ [[DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATE <replaceable>collation_name</replaceable>]
</programlisting>
<para>
@@ -619,6 +629,16 @@
<listitem>
<para>
+ If <literal>COLLATE <replaceable>Y</replaceable></literal>
+ was specified without <literal>CHARACTER SET</literal>, then
+ the character set associated with
+ <replaceable>Y</replaceable> and collation
+ <replaceable>Y</replaceable>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Otherwise, the database character set and collation.
</para>
</listitem>
@@ -693,6 +713,16 @@
<listitem>
<para>
+ If <literal>COLLATE <replaceable>Y</replaceable></literal>
+ was specified without <literal>CHARACTER SET</literal>, then
+ the character set associated with
+ <replaceable>Y</replaceable> and collation
+ <replaceable>Y</replaceable>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Otherwise, the table character set and collation are used.
</para>
</listitem>
Modified: trunk/refman-5.1/charset.xml
===================================================================
--- trunk/refman-5.1/charset.xml 2006-01-13 22:55:08 UTC (rev 818)
+++ trunk/refman-5.1/charset.xml 2006-01-13 23:47:16 UTC (rev 819)
@@ -527,6 +527,16 @@
<listitem>
<para>
+ If <literal>COLLATE <replaceable>Y</replaceable></literal>
+ was specified without <literal>CHARACTER SET</literal>, then
+ the character set associated with
+ <replaceable>Y</replaceable> and collation
+ <replaceable>Y</replaceable>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Otherwise, the server character set and server collation.
</para>
</listitem>
@@ -576,10 +586,10 @@
<programlisting>
CREATE TABLE <replaceable>tbl_name</replaceable> (<replaceable>column_list</replaceable>)
- [DEFAULT CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]]
+ [[DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATE <replaceable>collation_name</replaceable>]]
ALTER TABLE <replaceable>tbl_name</replaceable>
- [DEFAULT CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATE <replaceable>collation_name</replaceable>]
+ [[DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATE <replaceable>collation_name</replaceable>]
</programlisting>
<para>
@@ -619,6 +629,16 @@
<listitem>
<para>
+ If <literal>COLLATE <replaceable>Y</replaceable></literal>
+ was specified without <literal>CHARACTER SET</literal>, then
+ the character set associated with
+ <replaceable>Y</replaceable> and collation
+ <replaceable>Y</replaceable>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Otherwise, the database character set and collation.
</para>
</listitem>
@@ -693,6 +713,16 @@
<listitem>
<para>
+ If <literal>COLLATE <replaceable>Y</replaceable></literal>
+ was specified without <literal>CHARACTER SET</literal>, then
+ the character set associated with
+ <replaceable>Y</replaceable> and collation
+ <replaceable>Y</replaceable>.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Otherwise, the table character set and collation are used.
</para>
</listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r819 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 14 Jan |
