Author: paul
Date: 2008-03-08 04:40:35 +0100 (Sat, 08 Mar 2008)
New Revision: 10170
Log:
r29813@frost: paul | 2008-03-07 21:36:06 -0600
Add missing [DEFAULT] for COLLATE table option
Modified:
trunk/it/refman-5.1/sql-syntax.xml
trunk/pt/refman-5.1/sql-syntax.xml
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
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29812
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:29983
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:29813
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:29983
Modified: trunk/it/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/it/refman-5.1/sql-syntax.xml 2008-03-08 03:40:23 UTC (rev 10169)
+++ trunk/it/refman-5.1/sql-syntax.xml 2008-03-08 03:40:35 UTC (rev 10170)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 923 bytes
@@ -3019,7 +3019,7 @@
| AVG_ROW_LENGTH [=] <replaceable>value</replaceable>
| [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable>
| CHECKSUM [=] {0 | 1}
- | COLLATE <replaceable>collation_name</replaceable>
+ | [DEFAULT] COLLATE <replaceable>collation_name</replaceable>
| COMMENT [=] '<replaceable>string</replaceable>'
| CONNECTION [=] '<replaceable>connect_string</replaceable>'
| DATA DIRECTORY [=] '<replaceable>absolute path to directory</replaceable>'
@@ -4024,7 +4024,7 @@
<listitem>
<para>
- <literal>COLLATE</literal>
+ <literal>[DEFAULT] COLLATE</literal>
</para>
<para>
Modified: trunk/pt/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/pt/refman-5.1/sql-syntax.xml 2008-03-08 03:40:23 UTC (rev 10169)
+++ trunk/pt/refman-5.1/sql-syntax.xml 2008-03-08 03:40:35 UTC (rev 10170)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 923 bytes
@@ -3019,7 +3019,7 @@
| AVG_ROW_LENGTH [=] <replaceable>value</replaceable>
| [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable>
| CHECKSUM [=] {0 | 1}
- | COLLATE <replaceable>collation_name</replaceable>
+ | [DEFAULT] COLLATE <replaceable>collation_name</replaceable>
| COMMENT [=] '<replaceable>string</replaceable>'
| CONNECTION [=] '<replaceable>connect_string</replaceable>'
| DATA DIRECTORY [=] '<replaceable>absolute path to directory</replaceable>'
@@ -4024,7 +4024,7 @@
<listitem>
<para>
- <literal>COLLATE</literal>
+ <literal>[DEFAULT] COLLATE</literal>
</para>
<para>
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2008-03-08 03:40:23 UTC (rev 10169)
+++ trunk/refman-4.1/sql-syntax.xml 2008-03-08 03:40:35 UTC (rev 10170)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 873 bytes
@@ -1659,7 +1659,7 @@
| AVG_ROW_LENGTH = <replaceable>value</replaceable>
| [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable>
| CHECKSUM = {0 | 1}
- | COLLATE <replaceable>collation_name</replaceable>
+ | [DEFAULT] COLLATE <replaceable>collation_name</replaceable>
| COMMENT = '<replaceable>string</replaceable>'
| DATA DIRECTORY = '<replaceable>absolute path to directory</replaceable>'
| DELAY_KEY_WRITE = {0 | 1}
@@ -2540,7 +2540,7 @@
<listitem>
<para>
- <literal>COLLATE</literal>
+ <literal>[DEFAULT] COLLATE</literal>
</para>
<para>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2008-03-08 03:40:23 UTC (rev 10169)
+++ trunk/refman-5.0/sql-syntax.xml 2008-03-08 03:40:35 UTC (rev 10170)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 914 bytes
@@ -1757,7 +1757,7 @@
| AVG_ROW_LENGTH [=] <replaceable>value</replaceable>
| [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable>
| CHECKSUM [=] {0 | 1}
- | COLLATE <replaceable>collation_name</replaceable>
+ | [DEFAULT] COLLATE <replaceable>collation_name</replaceable>
| COMMENT [=] '<replaceable>string</replaceable>'
| CONNECTION [=] '<replaceable>connect_string</replaceable>'
| DATA DIRECTORY [=] '<replaceable>absolute path to directory</replaceable>'
@@ -2612,7 +2612,7 @@
<listitem>
<para>
- <literal>COLLATE</literal>
+ <literal>[DEFAULT] COLLATE</literal>
</para>
<para>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2008-03-08 03:40:23 UTC (rev 10169)
+++ trunk/refman-5.1/sql-syntax.xml 2008-03-08 03:40:35 UTC (rev 10170)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 914 bytes
@@ -3019,7 +3019,7 @@
| AVG_ROW_LENGTH [=] <replaceable>value</replaceable>
| [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable>
| CHECKSUM [=] {0 | 1}
- | COLLATE <replaceable>collation_name</replaceable>
+ | [DEFAULT] COLLATE <replaceable>collation_name</replaceable>
| COMMENT [=] '<replaceable>string</replaceable>'
| CONNECTION [=] '<replaceable>connect_string</replaceable>'
| DATA DIRECTORY [=] '<replaceable>absolute path to directory</replaceable>'
@@ -4024,7 +4024,7 @@
<listitem>
<para>
- <literal>COLLATE</literal>
+ <literal>[DEFAULT] COLLATE</literal>
</para>
<para>
Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml 2008-03-08 03:40:23 UTC (rev 10169)
+++ trunk/refman-6.0/sql-syntax.xml 2008-03-08 03:40:35 UTC (rev 10170)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 914 bytes
@@ -2945,7 +2945,7 @@
| AVG_ROW_LENGTH [=] <replaceable>value</replaceable>
| [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable>
| CHECKSUM [=] {0 | 1}
- | COLLATE <replaceable>collation_name</replaceable>
+ | [DEFAULT] COLLATE <replaceable>collation_name</replaceable>
| COMMENT [=] '<replaceable>string</replaceable>'
| CONNECTION [=] '<replaceable>connect_string</replaceable>'
| DATA DIRECTORY [=] '<replaceable>absolute path to directory</replaceable>'
@@ -3942,7 +3942,7 @@
<listitem>
<para>
- <literal>COLLATE</literal>
+ <literal>[DEFAULT] COLLATE</literal>
</para>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10170 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 8 Mar |
