Author: paul
Date: 2006-05-10 16:31:56 +0200 (Wed, 10 May 2006)
New Revision: 2066
Log:
r10277@frost: paul | 2006-05-10 09:30:33 -0500
Corrections to CREATE TABLE syntax. (Bug#18644)
Modified:
trunk/
trunk/refman-4.1/sql-syntax.xml
trunk/refman-5.0/sql-syntax.xml
trunk/refman-5.1/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:7365
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10275
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4886
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:7365
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10277
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4886
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-05-10 14:09:56 UTC (rev 2065)
+++ trunk/refman-4.1/sql-syntax.xml 2006-05-10 14:31:56 UTC (rev 2066)
@@ -1278,8 +1278,18 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
+ (<replaceable>create_definition</replaceable>,...)
+ [<replaceable>table_options</replaceable>]
+</programlisting>
+
+ <para>
+ Or:
+ </para>
+
+<programlisting>
+CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
[(<replaceable>create_definition</replaceable>,...)]
- [<replaceable>table_options</replaceable>] [<replaceable>select_statement</replaceable>]
+ [<replaceable>table_options</replaceable>] <replaceable>select_statement</replaceable>
</programlisting>
<para>
@@ -1288,7 +1298,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
- [(] LIKE <replaceable>old_tbl_name</replaceable> [)];
+ { LIKE <replaceable>old_tbl_name</replaceable> | (LIKE <replaceable>old_tbl_name</replaceable>) }
<replaceable>create_definition</replaceable>:
<replaceable>column_definition</replaceable>
@@ -1297,7 +1307,7 @@
| INDEX [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
| [CONSTRAINT [<replaceable>symbol</replaceable>]] UNIQUE [INDEX]
[<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
- | [FULLTEXT|SPATIAL] [INDEX] [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
+ | {FULLTEXT|SPATIAL} [INDEX] [<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>]
| CHECK (<replaceable>expr</replaceable>)
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-05-10 14:09:56 UTC (rev 2065)
+++ trunk/refman-5.0/sql-syntax.xml 2006-05-10 14:31:56 UTC (rev 2066)
@@ -1303,8 +1303,18 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
+ (<replaceable>create_definition</replaceable>,...)
+ [<replaceable>table_options</replaceable>]
+</programlisting>
+
+ <para>
+ Or:
+ </para>
+
+<programlisting>
+CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
[(<replaceable>create_definition</replaceable>,...)]
- [<replaceable>table_options</replaceable>] [<replaceable>select_statement</replaceable>]
+ [<replaceable>table_options</replaceable>] <replaceable>select_statement</replaceable>
</programlisting>
<para>
@@ -1313,7 +1323,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
- [(] LIKE <replaceable>old_tbl_name</replaceable> [)];
+ { LIKE <replaceable>old_tbl_name</replaceable> | (LIKE <replaceable>old_tbl_name</replaceable>) }
<replaceable>create_definition</replaceable>:
<replaceable>column_definition</replaceable>
@@ -1322,7 +1332,7 @@
| INDEX [<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
| [CONSTRAINT [<replaceable>symbol</replaceable>]] UNIQUE [INDEX]
[<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
- | [FULLTEXT|SPATIAL] [INDEX] [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
+ | {FULLTEXT|SPATIAL} [INDEX] [<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>]
| CHECK (<replaceable>expr</replaceable>)
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-05-10 14:09:56 UTC (rev 2065)
+++ trunk/refman-5.1/sql-syntax.xml 2006-05-10 14:31:56 UTC (rev 2066)
@@ -1773,9 +1773,20 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
+ (<replaceable>create_definition</replaceable>,...)
+ [<replaceable>partition_options</replaceable>]
+ [<replaceable>table_options</replaceable>]
+</programlisting>
+
+ <para>
+ Or:
+ </para>
+
+<programlisting>
+CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
[(<replaceable>create_definition</replaceable>,...)]
[<replaceable>partition_options</replaceable>]
- [<replaceable>table_options</replaceable>] [<replaceable>select_statement</replaceable>]
+ [<replaceable>table_options</replaceable>] <replaceable>select_statement</replaceable>
</programlisting>
<para>
@@ -1784,7 +1795,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
- [(] LIKE <replaceable>old_tbl_name</replaceable> [)];
+ { LIKE <replaceable>old_tbl_name</replaceable> | (LIKE <replaceable>old_tbl_name</replaceable>) }
<replaceable>create_definition</replaceable>:
<replaceable>column_definition</replaceable>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2066 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 10 May |
