Author: paul
Date: 2006-05-19 21:39:55 +0200 (Fri, 19 May 2006)
New Revision: 2132
Log:
r7637@polar: paul | 2006-05-19 11:48:31 -0500
Minor grammer simplification, alignment changes.
Modified:
trunk/
trunk/refman-5.1/sql-syntax.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:7632
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:7637
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10525
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:4886
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-05-19 19:39:43 UTC (rev 2131)
+++ trunk/refman-5.1/sql-syntax.xml 2006-05-19 19:39:55 UTC (rev 2132)
@@ -1844,7 +1844,8 @@
CREATE [TEMPORARY] TABLE [IF NOT EXISTS] <replaceable>tbl_name</replaceable>
[(<replaceable>create_definition</replaceable>,...)]
[<replaceable>table_options</replaceable>]
- [<replaceable>partition_options</replaceable>] <replaceable>select_statement</replaceable>
+ [<replaceable>partition_options</replaceable>]
+ <replaceable>select_statement</replaceable>
</programlisting>
<para>
@@ -1866,10 +1867,8 @@
| [CONSTRAINT [<replaceable>symbol</replaceable>]] UNIQUE [INDEX]
[<replaceable>index_name</replaceable>] [<replaceable>index_type</replaceable>] (<replaceable>index_col_name</replaceable>,...)
[<replaceable>index_option</replaceable> ...]
- | FULLTEXT [INDEX] [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
+ | {FULLTEXT|SPATIAL} [INDEX] [<replaceable>index_name</replaceable>] (<replaceable>index_col_name</replaceable>,...)
[<replaceable>index_option</replaceable> ...]
- | SPATIAL [INDEX] [<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>]
| CHECK (<replaceable>expr</replaceable>)
@@ -1950,14 +1949,14 @@
<replaceable>partition_options</replaceable>:
PARTITION BY
- [LINEAR] HASH(<replaceable>expr</replaceable>)
- | [LINEAR] KEY(<replaceable>column_list</replaceable>)
- | RANGE(<replaceable>expr</replaceable>)
- | LIST(<replaceable>expr</replaceable>)
+ [LINEAR] HASH(<replaceable>expr</replaceable>)
+ | [LINEAR] KEY(<replaceable>column_list</replaceable>)
+ | RANGE(<replaceable>expr</replaceable>)
+ | LIST(<replaceable>expr</replaceable>)
[PARTITIONS <replaceable>num</replaceable>]
- [ SUBPARTITION BY
- [LINEAR] HASH(<replaceable>expr</replaceable>)
- | [LINEAR] KEY(<replaceable>column_list</replaceable>)
+ [SUBPARTITION BY
+ [LINEAR] HASH(<replaceable>expr</replaceable>)
+ | [LINEAR] KEY(<replaceable>column_list</replaceable>)
[SUBPARTITIONS <replaceable>num</replaceable>]
]
[(<replaceable>partition_definition</replaceable> [, <replaceable>partition_definition</replaceable>] ...)]
@@ -1965,7 +1964,7 @@
<replaceable>partition_definition</replaceable>:
PARTITION <replaceable>partition_name</replaceable>
[VALUES {LESS THAN (<replaceable>expr</replaceable>) | <literal>MAXVALUE</literal> | IN (<replaceable>value_list</replaceable>)}]
- [[STORAGE] ENGINE [=] <replaceable>engine-name</replaceable>]
+ [[STORAGE] ENGINE [=] <replaceable>engine_name</replaceable>]
[COMMENT [=] <replaceable>'comment_text'</replaceable> ]
[DATA DIRECTORY [=] '<filename><replaceable>data_dir</replaceable></filename>']
[INDEX DIRECTORY [=] '<filename><replaceable>index_dir</replaceable></filename>']
@@ -1977,7 +1976,7 @@
<replaceable>subpartition_definition</replaceable>:
SUBPARTITION <replaceable>logical_name</replaceable>
- [[STORAGE] ENGINE [=] <replaceable>engine-name</replaceable>]
+ [[STORAGE] ENGINE [=] <replaceable>engine_name</replaceable>]
[COMMENT [=] <replaceable>'comment_text'</replaceable> ]
[DATA DIRECTORY [=] '<filename><replaceable>data_dir</replaceable></filename>']
[INDEX DIRECTORY [=] '<filename><replaceable>index_dir</replaceable></filename>']
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2132 - in trunk: . refman-5.1 | paul | 19 May |
