Author: paul
Date: 2008-03-15 00:39:25 +0100 (Sat, 15 Mar 2008)
New Revision: 10252
Log:
r30021@frost: paul | 2008-03-14 18:35:24 -0500
Small adjustments to INSERT/CREATE TABLE syntax
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:30020
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30059
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:35828
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:30021
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:30059
Modified: trunk/it/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/it/refman-5.1/sql-syntax.xml 2008-03-14 23:39:11 UTC (rev 10251)
+++ trunk/it/refman-5.1/sql-syntax.xml 2008-03-14 23:39:25 UTC (rev 10252)
Changed blocks: 6, Lines Added: 15, Lines Deleted: 9; 4074 bytes
@@ -2914,7 +2914,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
(<replaceable>create_definition</replaceable>,...)
- [<replaceable>table_option</replaceable> ...]
+ [<replaceable>table_option</replaceable>] ...
[<replaceable>partition_options</replaceable>]
</programlisting>
@@ -2925,7 +2925,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
[(<replaceable>create_definition</replaceable>,...)]
- [<replaceable>table_option</replaceable> ...]
+ [<replaceable>table_option</replaceable>] ...
[<replaceable>partition_options</replaceable>]
<replaceable>select_statement</replaceable>
</programlisting>
@@ -2943,14 +2943,14 @@
<replaceable>create_definition</replaceable>:
<replaceable>col_name</replaceable>
<replaceable>column_definition</replaceable>
| [CONSTRAINT [<replaceable>symbol</replaceable>]] PRIMARY KEY
[<replaceable>index_type</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| {INDEX|KEY} [<replaceable>index_name</replaceable>]
[<replaceable>index_type</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| [CONSTRAINT [<replaceable>symbol</replaceable>]] UNIQUE [INDEX|KEY]
[<replaceable>index_name</replaceable>]
[<replaceable>index_type</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| {FULLTEXT|SPATIAL} [INDEX|KEY] [<replaceable>index_name</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| [CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY
[<replaceable>index_name</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
<replaceable>reference_definition</replaceable>
| CHECK (<replaceable>expr</replaceable>)
@@ -6668,7 +6668,9 @@
INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
[(<replaceable>col_name</replaceable>,...)]
VALUES ({<replaceable>expr</replaceable> | DEFAULT},...),(...),...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<para>
@@ -6679,7 +6681,9 @@
INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
SET
<replaceable>col_name</replaceable>={<replaceable>expr</replaceable>
| DEFAULT}, ...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<para>
@@ -6690,7 +6694,9 @@
INSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
[(<replaceable>col_name</replaceable>,...)]
SELECT ...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<remark role="help-syntax-end"/>
Modified: trunk/pt/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/pt/refman-5.1/sql-syntax.xml 2008-03-14 23:39:11 UTC (rev 10251)
+++ trunk/pt/refman-5.1/sql-syntax.xml 2008-03-14 23:39:25 UTC (rev 10252)
Changed blocks: 6, Lines Added: 15, Lines Deleted: 9; 4074 bytes
@@ -2914,7 +2914,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
(<replaceable>create_definition</replaceable>,...)
- [<replaceable>table_option</replaceable> ...]
+ [<replaceable>table_option</replaceable>] ...
[<replaceable>partition_options</replaceable>]
</programlisting>
@@ -2925,7 +2925,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
[(<replaceable>create_definition</replaceable>,...)]
- [<replaceable>table_option</replaceable> ...]
+ [<replaceable>table_option</replaceable>] ...
[<replaceable>partition_options</replaceable>]
<replaceable>select_statement</replaceable>
</programlisting>
@@ -2943,14 +2943,14 @@
<replaceable>create_definition</replaceable>:
<replaceable>col_name</replaceable>
<replaceable>column_definition</replaceable>
| [CONSTRAINT [<replaceable>symbol</replaceable>]] PRIMARY KEY
[<replaceable>index_type</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| {INDEX|KEY} [<replaceable>index_name</replaceable>]
[<replaceable>index_type</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| [CONSTRAINT [<replaceable>symbol</replaceable>]] UNIQUE [INDEX|KEY]
[<replaceable>index_name</replaceable>]
[<replaceable>index_type</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| {FULLTEXT|SPATIAL} [INDEX|KEY] [<replaceable>index_name</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| [CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY
[<replaceable>index_name</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
<replaceable>reference_definition</replaceable>
| CHECK (<replaceable>expr</replaceable>)
@@ -6668,7 +6668,9 @@
INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
[(<replaceable>col_name</replaceable>,...)]
VALUES ({<replaceable>expr</replaceable> | DEFAULT},...),(...),...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<para>
@@ -6679,7 +6681,9 @@
INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
SET
<replaceable>col_name</replaceable>={<replaceable>expr</replaceable>
| DEFAULT}, ...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<para>
@@ -6690,7 +6694,9 @@
INSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
[(<replaceable>col_name</replaceable>,...)]
SELECT ...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<remark role="help-syntax-end"/>
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2008-03-14 23:39:11 UTC (rev 10251)
+++ trunk/refman-4.1/sql-syntax.xml 2008-03-14 23:39:25 UTC (rev 10252)
Changed blocks: 6, Lines Added: 12, Lines Deleted: 6; 2901 bytes
@@ -1557,7 +1557,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
(<replaceable>create_definition</replaceable>,...)
- [<replaceable>table_option</replaceable> ...]
+ [<replaceable>table_option</replaceable>] ...
</programlisting>
<para>
@@ -1567,7 +1567,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
[(<replaceable>create_definition</replaceable>,...)]
- [<replaceable>table_option</replaceable> ...]
+ [<replaceable>table_option</replaceable>] ...
<replaceable>select_statement</replaceable>
</programlisting>
@@ -1740,7 +1740,7 @@
<note>
<para>
- : If you use <literal>IF NOT EXISTS</literal> in a
+ If you use <literal>IF NOT EXISTS</literal> in a
<literal>CREATE TABLE ... SELECT</literal> statement, any rows
selected by the <literal>SELECT</literal> part are inserted
regardless of whether the table already exists.
@@ -4322,7 +4322,9 @@
INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
[(<replaceable>col_name</replaceable>,...)]
VALUES ({<replaceable>expr</replaceable> | DEFAULT},...),(...),...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<para>
@@ -4333,7 +4335,9 @@
INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
SET
<replaceable>col_name</replaceable>={<replaceable>expr</replaceable>
| DEFAULT}, ...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<para>
@@ -4344,7 +4348,9 @@
INSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
[(<replaceable>col_name</replaceable>,...)]
SELECT ...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<remark role="help-syntax-end"/>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2008-03-14 23:39:11 UTC (rev 10251)
+++ trunk/refman-5.0/sql-syntax.xml 2008-03-14 23:39:25 UTC (rev 10252)
Changed blocks: 5, Lines Added: 11, Lines Deleted: 5; 2530 bytes
@@ -1654,7 +1654,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
(<replaceable>create_definition</replaceable>,...)
- [<replaceable>table_option</replaceable> ...]
+ [<replaceable>table_option</replaceable>] ...
</programlisting>
<para>
@@ -1664,7 +1664,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
[(<replaceable>create_definition</replaceable>,...)]
- [<replaceable>table_option</replaceable> ...]
+ [<replaceable>table_option</replaceable>] ...
<replaceable>select_statement</replaceable>
</programlisting>
@@ -4332,7 +4332,9 @@
INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
[(<replaceable>col_name</replaceable>,...)]
VALUES ({<replaceable>expr</replaceable> | DEFAULT},...),(...),...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<para>
@@ -4343,7 +4345,9 @@
INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
SET
<replaceable>col_name</replaceable>={<replaceable>expr</replaceable>
| DEFAULT}, ...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<para>
@@ -4354,7 +4358,9 @@
INSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
[(<replaceable>col_name</replaceable>,...)]
SELECT ...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<remark role="help-syntax-end"/>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2008-03-14 23:39:11 UTC (rev 10251)
+++ trunk/refman-5.1/sql-syntax.xml 2008-03-14 23:39:25 UTC (rev 10252)
Changed blocks: 6, Lines Added: 15, Lines Deleted: 9; 4065 bytes
@@ -2914,7 +2914,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
(<replaceable>create_definition</replaceable>,...)
- [<replaceable>table_option</replaceable> ...]
+ [<replaceable>table_option</replaceable>] ...
[<replaceable>partition_options</replaceable>]
</programlisting>
@@ -2925,7 +2925,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
[(<replaceable>create_definition</replaceable>,...)]
- [<replaceable>table_option</replaceable> ...]
+ [<replaceable>table_option</replaceable>] ...
[<replaceable>partition_options</replaceable>]
<replaceable>select_statement</replaceable>
</programlisting>
@@ -2943,14 +2943,14 @@
<replaceable>create_definition</replaceable>:
<replaceable>col_name</replaceable>
<replaceable>column_definition</replaceable>
| [CONSTRAINT [<replaceable>symbol</replaceable>]] PRIMARY KEY
[<replaceable>index_type</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| {INDEX|KEY} [<replaceable>index_name</replaceable>]
[<replaceable>index_type</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| [CONSTRAINT [<replaceable>symbol</replaceable>]] UNIQUE [INDEX|KEY]
[<replaceable>index_name</replaceable>]
[<replaceable>index_type</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| {FULLTEXT|SPATIAL} [INDEX|KEY] [<replaceable>index_name</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| [CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY
[<replaceable>index_name</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
<replaceable>reference_definition</replaceable>
| CHECK (<replaceable>expr</replaceable>)
@@ -6668,7 +6668,9 @@
INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
[(<replaceable>col_name</replaceable>,...)]
VALUES ({<replaceable>expr</replaceable> | DEFAULT},...),(...),...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<para>
@@ -6679,7 +6681,9 @@
INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
SET
<replaceable>col_name</replaceable>={<replaceable>expr</replaceable>
| DEFAULT}, ...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<para>
@@ -6690,7 +6694,9 @@
INSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
[(<replaceable>col_name</replaceable>,...)]
SELECT ...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<remark role="help-syntax-end"/>
Modified: trunk/refman-6.0/sql-syntax.xml
===================================================================
--- trunk/refman-6.0/sql-syntax.xml 2008-03-14 23:39:11 UTC (rev 10251)
+++ trunk/refman-6.0/sql-syntax.xml 2008-03-14 23:39:25 UTC (rev 10252)
Changed blocks: 6, Lines Added: 15, Lines Deleted: 9; 4065 bytes
@@ -2841,7 +2841,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
(<replaceable>create_definition</replaceable>,...)
- [<replaceable>table_option</replaceable> ...]
+ [<replaceable>table_option</replaceable>] ...
[<replaceable>partition_options</replaceable>]
</programlisting>
@@ -2852,7 +2852,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
[(<replaceable>create_definition</replaceable>,...)]
- [<replaceable>table_option</replaceable> ...]
+ [<replaceable>table_option</replaceable>] ...
[<replaceable>partition_options</replaceable>]
<replaceable>select_statement</replaceable>
</programlisting>
@@ -2870,14 +2870,14 @@
<replaceable>create_definition</replaceable>:
<replaceable>col_name</replaceable>
<replaceable>column_definition</replaceable>
| [CONSTRAINT [<replaceable>symbol</replaceable>]] PRIMARY KEY
[<replaceable>index_type</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| {INDEX|KEY} [<replaceable>index_name</replaceable>]
[<replaceable>index_type</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| [CONSTRAINT [<replaceable>symbol</replaceable>]] UNIQUE [INDEX|KEY]
[<replaceable>index_name</replaceable>]
[<replaceable>index_type</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| {FULLTEXT|SPATIAL} [INDEX|KEY] [<replaceable>index_name</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
- [<replaceable>index_option</replaceable> ...]
+ [<replaceable>index_option</replaceable>] ...
| [CONSTRAINT [<replaceable>symbol</replaceable>]] FOREIGN KEY
[<replaceable>index_name</replaceable>]
(<replaceable>index_col_name</replaceable>,...)
<replaceable>reference_definition</replaceable>
| CHECK (<replaceable>expr</replaceable>)
@@ -6534,7 +6534,9 @@
INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
[(<replaceable>col_name</replaceable>,...)]
VALUES ({<replaceable>expr</replaceable> | DEFAULT},...),(...),...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<para>
@@ -6545,7 +6547,9 @@
INSERT [LOW_PRIORITY | DELAYED | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
SET
<replaceable>col_name</replaceable>={<replaceable>expr</replaceable>
| DEFAULT}, ...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<para>
@@ -6556,7 +6560,9 @@
INSERT [LOW_PRIORITY | HIGH_PRIORITY] [IGNORE]
[INTO] <replaceable>tbl_name</replaceable>
[(<replaceable>col_name</replaceable>,...)]
SELECT ...
- [ ON DUPLICATE KEY UPDATE
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>,
... ]
+ [ ON DUPLICATE KEY UPDATE
+
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>
+ [,
<replaceable>col_name</replaceable>=<replaceable>expr</replaceable>]
... ]
</programlisting>
<remark role="help-syntax-end"/>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r10252 - in trunk: . it/refman-5.1 pt/refman-5.1 refman-4.1 refman-5.0 refman-5.1 refman-6.0 | paul | 15 Mar |