Author: paul
Date: 2006-05-19 21:40:06 +0200 (Fri, 19 May 2006)
New Revision: 2133
Log:
r7638@polar: paul | 2006-05-19 11:53:45 -0500
Junk the table_options production.
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:7637
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10525
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4886
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:7638
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10525
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-19 19:39:55 UTC (rev 2132)
+++ trunk/refman-4.1/sql-syntax.xml 2006-05-19 19:40:06 UTC (rev 2133)
@@ -153,7 +153,7 @@
| [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]
| DISCARD TABLESPACE
| IMPORT TABLESPACE
- | <replaceable>table_options</replaceable>
+ | <replaceable>table_option</replaceable> ...
</programlisting>
<remark role="help-description-begin"/>
@@ -171,7 +171,7 @@
<para>
The syntax for many of the allowable alterations is similar to
clauses of the <literal>CREATE TABLE</literal> statement. This
- includes <replaceable>table_options</replaceable> modifications,
+ includes <replaceable>table_option</replaceable> modifications,
for options such as <literal>ENGINE</literal>,
<literal>AUTO_INCREMENT</literal>, and
<literal>AVG_ROW_LENGTH</literal>. (However, <literal>ALTER
@@ -1266,7 +1266,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
(<replaceable>create_definition</replaceable>,...)
- [<replaceable>table_options</replaceable>]
+ [<replaceable>table_option</replaceable> ...]
</programlisting>
<para>
@@ -1276,7 +1276,8 @@
<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_option</replaceable> ...]
+ <replaceable>select_statement</replaceable>
</programlisting>
<para>
@@ -1349,8 +1350,6 @@
<replaceable>reference_option</replaceable>:
RESTRICT | CASCADE | SET NULL | NO ACTION
-<replaceable>table_options</replaceable>: <replaceable>table_option</replaceable> [<replaceable>table_option</replaceable>] ...
-
<replaceable>table_option</replaceable>:
{ENGINE|TYPE} = <replaceable>engine_name</replaceable>
| AUTO_INCREMENT = <replaceable>value</replaceable>
@@ -2005,7 +2004,7 @@
</itemizedlist>
<para>
- The <replaceable>table_options</replaceable> part of the
+ The <replaceable>table_option</replaceable> part of the
<literal>CREATE TABLE</literal> syntax can be used in MySQL 3.23
and above. The <literal>=</literal> that separates an option
name and its value is optional as of MySQL 4.1.
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-05-19 19:39:55 UTC (rev 2132)
+++ trunk/refman-5.0/sql-syntax.xml 2006-05-19 19:40:06 UTC (rev 2133)
@@ -195,7 +195,7 @@
| [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]
| DISCARD TABLESPACE
| IMPORT TABLESPACE
- | <replaceable>table_options</replaceable>
+ | <replaceable>table_option</replaceable> ...
</programlisting>
<remark role="help-description-begin"/>
@@ -213,7 +213,7 @@
<para>
The syntax for many of the allowable alterations is similar to
clauses of the <literal>CREATE TABLE</literal> statement. This
- includes <replaceable>table_options</replaceable> modifications,
+ includes <replaceable>table_option</replaceable> modifications,
for options such as <literal>ENGINE</literal>,
<literal>AUTO_INCREMENT</literal>, and
<literal>AVG_ROW_LENGTH</literal>. (However, <literal>ALTER
@@ -1304,7 +1304,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
(<replaceable>create_definition</replaceable>,...)
- [<replaceable>table_options</replaceable>]
+ [<replaceable>table_option</replaceable> ...]
</programlisting>
<para>
@@ -1314,7 +1314,8 @@
<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_option</replaceable> ...]
+ <replaceable>select_statement</replaceable>
</programlisting>
<para>
@@ -1387,8 +1388,6 @@
<replaceable>reference_option</replaceable>:
RESTRICT | CASCADE | SET NULL | NO ACTION
-<replaceable>table_options</replaceable>: <replaceable>table_option</replaceable> [<replaceable>table_option</replaceable>] ...
-
<replaceable>table_option</replaceable>:
{ENGINE|TYPE} [=] <replaceable>engine_name</replaceable>
| AUTO_INCREMENT [=] <replaceable>value</replaceable>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-05-19 19:39:55 UTC (rev 2132)
+++ trunk/refman-5.1/sql-syntax.xml 2006-05-19 19:40:06 UTC (rev 2133)
@@ -204,7 +204,7 @@
| [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]
| DISCARD TABLESPACE
| IMPORT TABLESPACE
- | <replaceable>table_options</replaceable>
+ | <replaceable>table_option</replaceable> ...
| <replaceable>partition_options</replaceable>
| ADD PARTITION (<replaceable>partition_definition</replaceable>)
| DROP PARTITION <replaceable>partition_names</replaceable>
@@ -233,7 +233,7 @@
<para>
The syntax for many of the allowable alterations is similar to
clauses of the <literal>CREATE TABLE</literal> statement. This
- includes <replaceable>table_options</replaceable> modifications,
+ includes <replaceable>table_option</replaceable> modifications,
for options such as <literal>ENGINE</literal>,
<literal>AUTO_INCREMENT</literal>, and
<literal>AVG_ROW_LENGTH</literal>. (However, <literal>ALTER
@@ -1832,7 +1832,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
(<replaceable>create_definition</replaceable>,...)
- [<replaceable>table_options</replaceable>]
+ [<replaceable>table_option</replaceable> ...]
[<replaceable>partition_options</replaceable>]
</programlisting>
@@ -1843,7 +1843,7 @@
<programlisting>
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
[(<replaceable>create_definition</replaceable>,...)]
- [<replaceable>table_options</replaceable>]
+ [<replaceable>table_option</replaceable> ...]
[<replaceable>partition_options</replaceable>]
<replaceable>select_statement</replaceable>
</programlisting>
@@ -1923,8 +1923,6 @@
<replaceable>reference_option</replaceable>:
RESTRICT | CASCADE | SET NULL | NO ACTION
-<replaceable>table_options</replaceable>: <replaceable>table_option</replaceable> [<replaceable>table_option</replaceable>] ...
-
<replaceable>table_option</replaceable>:
[TABLESPACE <replaceable>tablespace_name</replaceable> STORAGE DISK]
ENGINE [=] <replaceable>engine_name</replaceable>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2133 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 19 May |
