Author: paul
Date: 2008-07-29 18:51:01 +0200 (Tue, 29 Jul 2008)
New Revision: 11422
Log:
r32576@arctic: paul | 2008-07-29 10:53:36 -0500
Minor foreign key syntax corrections re: optional clauses
Modified:
trunk/refman-4.1/se-innodb-core.xml
trunk/refman-4.1/sql-syntax-data-definition.xml
trunk/refman-5.0/se-innodb-core.xml
trunk/refman-5.0/sql-syntax-data-definition.xml
trunk/refman-5.1/se-innodb-core.xml
trunk/refman-5.1/sql-syntax-data-definition.xml
trunk/refman-6.0/se-innodb-core.xml
trunk/refman-6.0/sql-syntax-data-definition.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:33040
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32506
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:33040
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:32576
Modified: trunk/refman-4.1/se-innodb-core.xml
===================================================================
--- trunk/refman-4.1/se-innodb-core.xml 2008-07-29 16:07:14 UTC (rev 11421)
+++ trunk/refman-4.1/se-innodb-core.xml 2008-07-29 16:51:01 UTC (rev 11422)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1454 bytes
@@ -2356,7 +2356,7 @@
</para>
<programlisting>
-[CONSTRAINT <replaceable>symbol</replaceable>] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
+[CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>, ...)
[ON DELETE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
[ON UPDATE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
@@ -2699,7 +2699,7 @@
<programlisting>
ALTER TABLE <replaceable>tbl_name</replaceable>
- ADD [CONSTRAINT <replaceable>symbol</replaceable>] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
+ ADD [CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>, ...)
[ON DELETE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
[ON UPDATE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
Modified: trunk/refman-4.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-4.1/sql-syntax-data-definition.xml 2008-07-29 16:07:14 UTC (rev 11421)
+++ trunk/refman-4.1/sql-syntax-data-definition.xml 2008-07-29 16:51:01 UTC (rev 11422)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 776 bytes
@@ -1638,7 +1638,7 @@
USING {BTREE | HASH | RTREE}
<replaceable>reference_definition</replaceable>:
- REFERENCES <replaceable>tbl_name</replaceable> [(<replaceable>index_col_name</replaceable>,...)]
+ REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>,...)
[MATCH FULL | MATCH PARTIAL | MATCH SIMPLE]
[ON DELETE <replaceable>reference_option</replaceable>]
[ON UPDATE <replaceable>reference_option</replaceable>]
Modified: trunk/refman-5.0/se-innodb-core.xml
===================================================================
--- trunk/refman-5.0/se-innodb-core.xml 2008-07-29 16:07:14 UTC (rev 11421)
+++ trunk/refman-5.0/se-innodb-core.xml 2008-07-29 16:51:01 UTC (rev 11422)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1454 bytes
@@ -2479,7 +2479,7 @@
</para>
<programlisting>
-[CONSTRAINT <replaceable>symbol</replaceable>] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
+[CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>, ...)
[ON DELETE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
[ON UPDATE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
@@ -2808,7 +2808,7 @@
<programlisting>
ALTER TABLE <replaceable>tbl_name</replaceable>
- ADD [CONSTRAINT <replaceable>symbol</replaceable>] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
+ ADD [CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>, ...)
[ON DELETE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
[ON UPDATE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
Modified: trunk/refman-5.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.0/sql-syntax-data-definition.xml 2008-07-29 16:07:14 UTC (rev 11421)
+++ trunk/refman-5.0/sql-syntax-data-definition.xml 2008-07-29 16:51:01 UTC (rev 11422)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 776 bytes
@@ -1728,7 +1728,7 @@
USING {BTREE | HASH | RTREE}
<replaceable>reference_definition</replaceable>:
- REFERENCES <replaceable>tbl_name</replaceable> [(<replaceable>index_col_name</replaceable>,...)]
+ REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>,...)
[MATCH FULL | MATCH PARTIAL | MATCH SIMPLE]
[ON DELETE <replaceable>reference_option</replaceable>]
[ON UPDATE <replaceable>reference_option</replaceable>]
Modified: trunk/refman-5.1/se-innodb-core.xml
===================================================================
--- trunk/refman-5.1/se-innodb-core.xml 2008-07-29 16:07:14 UTC (rev 11421)
+++ trunk/refman-5.1/se-innodb-core.xml 2008-07-29 16:51:01 UTC (rev 11422)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1454 bytes
@@ -3151,7 +3151,7 @@
</para>
<programlisting>
-[CONSTRAINT <replaceable>symbol</replaceable>] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
+[CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>, ...)
[ON DELETE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
[ON UPDATE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
@@ -3491,7 +3491,7 @@
<programlisting>
ALTER TABLE <replaceable>tbl_name</replaceable>
- ADD [CONSTRAINT <replaceable>symbol</replaceable>] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
+ ADD [CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>, ...)
[ON DELETE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
[ON UPDATE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
Modified: trunk/refman-5.1/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-5.1/sql-syntax-data-definition.xml 2008-07-29 16:07:14 UTC (rev 11421)
+++ trunk/refman-5.1/sql-syntax-data-definition.xml 2008-07-29 16:51:01 UTC (rev 11422)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 798 bytes
@@ -3064,7 +3064,7 @@
| WITH PARSER <replaceable>parser_name</replaceable>
<replaceable>reference_definition</replaceable>:
- REFERENCES <replaceable>tbl_name</replaceable> [(<replaceable>index_col_name</replaceable>,...)]
+ REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>,...)
[MATCH FULL | MATCH PARTIAL | MATCH SIMPLE]
[ON DELETE <replaceable>reference_option</replaceable>]
[ON UPDATE <replaceable>reference_option</replaceable>]
Modified: trunk/refman-6.0/se-innodb-core.xml
===================================================================
--- trunk/refman-6.0/se-innodb-core.xml 2008-07-29 16:07:14 UTC (rev 11421)
+++ trunk/refman-6.0/se-innodb-core.xml 2008-07-29 16:51:01 UTC (rev 11422)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1454 bytes
@@ -3056,7 +3056,7 @@
</para>
<programlisting>
-[CONSTRAINT <replaceable>symbol</replaceable>] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
+[CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>, ...)
[ON DELETE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
[ON UPDATE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
@@ -3394,7 +3394,7 @@
<programlisting>
ALTER TABLE <replaceable>tbl_name</replaceable>
- ADD [CONSTRAINT <replaceable>symbol</replaceable>] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
+ ADD [CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>, ...)
REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>, ...)
[ON DELETE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
[ON UPDATE {RESTRICT | CASCADE | SET NULL | NO ACTION}]
Modified: trunk/refman-6.0/sql-syntax-data-definition.xml
===================================================================
--- trunk/refman-6.0/sql-syntax-data-definition.xml 2008-07-29 16:07:14 UTC (rev 11421)
+++ trunk/refman-6.0/sql-syntax-data-definition.xml 2008-07-29 16:51:01 UTC (rev 11422)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 791 bytes
@@ -2772,7 +2772,7 @@
| COMMENT '<replaceable>string</replaceable>'
<replaceable>reference_definition</replaceable>:
- REFERENCES <replaceable>tbl_name</replaceable> [(<replaceable>index_col_name</replaceable>,...)]
+ REFERENCES <replaceable>tbl_name</replaceable> (<replaceable>index_col_name</replaceable>,...)
[MATCH FULL | MATCH PARTIAL | MATCH SIMPLE]
[ON DELETE <replaceable>reference_option</replaceable>]
[ON UPDATE <replaceable>reference_option</replaceable>]
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r11422 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul.dubois | 29 Jul |
