Author: paul
Date: 2007-10-03 18:50:40 +0200 (Wed, 03 Oct 2007)
New Revision: 7954
Log:
r25283@frost: paul | 2007-10-03 09:16:58 -0500
We had reference_definition marked with [ ... ] in a couple places
where, according to grammar, it's not optional.
Modified:
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/sql-syntax.xml
trunk/refman-5.2/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:30608
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25268
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:30608
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:25283
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:20005
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2007-10-03 16:49:48 UTC (rev 7953)
+++ trunk/refman-4.1/sql-syntax.xml 2007-10-03 16:50:40 UTC (rev 7954)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1675 bytes
@@ -148,7 +148,7 @@
| ADD [FULLTEXT|SPATIAL] [INDEX|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>,...)
- [<replaceable>reference_definition</replaceable>]
+ <replaceable>reference_definition</replaceable>
| ALTER [COLUMN] <replaceable>col_name</replaceable> {SET DEFAULT <replaceable>literal</replaceable> | DROP DEFAULT}
| CHANGE [COLUMN] <replaceable>old_col_name</replaceable> <replaceable>column_definition</replaceable>
[FIRST|AFTER <replaceable>col_name</replaceable>]
@@ -1562,7 +1562,7 @@
[<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
| {FULLTEXT|SPATIAL} [INDEX|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>,...) [<replaceable>reference_definition</replaceable>]
+ [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...) <replaceable>reference_definition</replaceable>
| CHECK (<replaceable>expr</replaceable>)
<replaceable>column_definition</replaceable>:
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2007-10-03 16:49:48 UTC (rev 7953)
+++ trunk/refman-5.0/sql-syntax.xml 2007-10-03 16:50:40 UTC (rev 7954)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1675 bytes
@@ -190,7 +190,7 @@
| ADD [FULLTEXT|SPATIAL] [INDEX|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>,...)
- [<replaceable>reference_definition</replaceable>]
+ <replaceable>reference_definition</replaceable>
| ALTER [COLUMN] <replaceable>col_name</replaceable> {SET DEFAULT <replaceable>literal</replaceable> | DROP DEFAULT}
| CHANGE [COLUMN] <replaceable>old_col_name</replaceable> <replaceable>column_definition</replaceable>
[FIRST|AFTER <replaceable>col_name</replaceable>]
@@ -1637,7 +1637,7 @@
[<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
| {FULLTEXT|SPATIAL} [INDEX|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>,...) [<replaceable>reference_definition</replaceable>]
+ [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...) <replaceable>reference_definition</replaceable>
| CHECK (<replaceable>expr</replaceable>)
<replaceable>column_definition</replaceable>:
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2007-10-03 16:49:48 UTC (rev 7953)
+++ trunk/refman-5.1/sql-syntax.xml 2007-10-03 16:50:40 UTC (rev 7954)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1582 bytes
@@ -356,7 +356,7 @@
| ADD SPATIAL [INDEX|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>,...)
- [<replaceable>reference_definition</replaceable>]
+ <replaceable>reference_definition</replaceable>
| ALTER [COLUMN] <replaceable>col_name</replaceable> {SET DEFAULT <replaceable>literal</replaceable> | DROP DEFAULT}
| CHANGE [COLUMN] <replaceable>old_col_name</replaceable> <replaceable>column_definition</replaceable>
[FIRST|AFTER <replaceable>col_name</replaceable>]
@@ -2701,7 +2701,7 @@
| {FULLTEXT|SPATIAL} [INDEX|KEY] [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
[<replaceable>index_option</replaceable> ...]
| [CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY
- [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...) [<replaceable>reference_definition</replaceable>]
+ [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...) <replaceable>reference_definition</replaceable>
| CHECK (<replaceable>expr</replaceable>)
<replaceable>column_definition</replaceable>:
Modified: trunk/refman-5.2/sql-syntax.xml
===================================================================
--- trunk/refman-5.2/sql-syntax.xml 2007-10-03 16:49:48 UTC (rev 7953)
+++ trunk/refman-5.2/sql-syntax.xml 2007-10-03 16:50:40 UTC (rev 7954)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 1582 bytes
@@ -356,7 +356,7 @@
| ADD SPATIAL [INDEX|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>,...)
- [<replaceable>reference_definition</replaceable>]
+ <replaceable>reference_definition</replaceable>
| ALTER [COLUMN] <replaceable>col_name</replaceable> {SET DEFAULT <replaceable>literal</replaceable> | DROP DEFAULT}
| CHANGE [COLUMN] <replaceable>old_col_name</replaceable> <replaceable>column_definition</replaceable>
[FIRST|AFTER <replaceable>col_name</replaceable>]
@@ -2708,7 +2708,7 @@
| {FULLTEXT|SPATIAL} [INDEX|KEY] [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
[<replaceable>index_option</replaceable> ...]
| [CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY
- [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...) [<replaceable>reference_definition</replaceable>]
+ [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...) <replaceable>reference_definition</replaceable>
| CHECK (<replaceable>expr</replaceable>)
<replaceable>column_definition</replaceable>:
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r7954 - in trunk: . refman-4.1 refman-5.0 refman-5.1 refman-5.2 | paul | 3 Oct |
