Author: paul
Date: 2006-05-26 20:39:49 +0200 (Fri, 26 May 2006)
New Revision: 2215
Log:
r10072@polar: paul | 2006-05-26 13:39:26 -0500
Update data types part of CREATE TABLE syntax.
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:10068
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10755
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7517
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:10072
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:10755
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:7517
Modified: trunk/refman-4.1/sql-syntax.xml
===================================================================
--- trunk/refman-4.1/sql-syntax.xml 2006-05-26 17:26:25 UTC (rev 2214)
+++ trunk/refman-4.1/sql-syntax.xml 2006-05-26 18:39:49 UTC (rev 2215)
@@ -1334,8 +1334,10 @@
| TIMESTAMP
| DATETIME
| YEAR
- | CHAR(<replaceable>length</replaceable>) [BINARY | ASCII | UNICODE]
- | VARCHAR(<replaceable>length</replaceable>) [BINARY]
+ | CHAR(<replaceable>length</replaceable>)
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
+ | VARCHAR(<replaceable>length</replaceable>)
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| BINARY(<replaceable>length</replaceable>)
| VARBINARY(<replaceable>length</replaceable>)
| TINYBLOB
@@ -1343,11 +1345,17 @@
| MEDIUMBLOB
| LONGBLOB
| TINYTEXT [BINARY]
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| TEXT [BINARY]
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| MEDIUMTEXT [BINARY]
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| LONGTEXT [BINARY]
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| ENUM(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,<replaceable>value3</replaceable>,...)
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| SET(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,<replaceable>value3</replaceable>,...)
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| <replaceable>spatial_type</replaceable>
<replaceable>index_col_name</replaceable>:
@@ -1493,6 +1501,13 @@
types, see <xref linkend="spatial-extensions"/>.
</para>
+ <para>
+ Some attributes do not apply to all data types.
+ <literal>AUTO_INCREMENT</literal> applies only to integer types.
+ <literal>DEFAULT</literal> does not apply to the
+ <literal>BLOB</literal> or <literal>TEXT</literal> types.
+ </para>
+
<itemizedlist>
<listitem>
Modified: trunk/refman-5.0/sql-syntax.xml
===================================================================
--- trunk/refman-5.0/sql-syntax.xml 2006-05-26 17:26:25 UTC (rev 2214)
+++ trunk/refman-5.0/sql-syntax.xml 2006-05-26 18:39:49 UTC (rev 2215)
@@ -1355,7 +1355,8 @@
[COMMENT '<replaceable>string</replaceable>'] [<replaceable>reference_definition</replaceable>]
<replaceable>data_type</replaceable>:
- TINYINT[(<replaceable>length</replaceable>)] [UNSIGNED] [ZEROFILL]
+ BIT[(<replaceable>length</replaceable>)]
+ | TINYINT[(<replaceable>length</replaceable>)] [UNSIGNED] [ZEROFILL]
| SMALLINT[(<replaceable>length</replaceable>)] [UNSIGNED] [ZEROFILL]
| MEDIUMINT[(<replaceable>length</replaceable>)] [UNSIGNED] [ZEROFILL]
| INT[(<replaceable>length</replaceable>)] [UNSIGNED] [ZEROFILL]
@@ -1371,8 +1372,10 @@
| TIMESTAMP
| DATETIME
| YEAR
- | CHAR(<replaceable>length</replaceable>) [BINARY | ASCII | UNICODE]
- | VARCHAR(<replaceable>length</replaceable>) [BINARY]
+ | CHAR(<replaceable>length</replaceable>)
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
+ | VARCHAR(<replaceable>length</replaceable>)
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| BINARY(<replaceable>length</replaceable>)
| VARBINARY(<replaceable>length</replaceable>)
| TINYBLOB
@@ -1380,11 +1383,17 @@
| MEDIUMBLOB
| LONGBLOB
| TINYTEXT [BINARY]
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| TEXT [BINARY]
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| MEDIUMTEXT [BINARY]
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| LONGTEXT [BINARY]
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| ENUM(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,<replaceable>value3</replaceable>,...)
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| SET(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,<replaceable>value3</replaceable>,...)
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| <replaceable>spatial_type</replaceable>
<replaceable>index_col_name</replaceable>:
@@ -1527,6 +1536,13 @@
types, see <xref linkend="spatial-extensions"/>.
</para>
+ <para>
+ Some attributes do not apply to all data types.
+ <literal>AUTO_INCREMENT</literal> applies only to integer types.
+ <literal>DEFAULT</literal> does not apply to the
+ <literal>BLOB</literal> or <literal>TEXT</literal> types.
+ </para>
+
<itemizedlist>
<listitem>
Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml 2006-05-26 17:26:25 UTC (rev 2214)
+++ trunk/refman-5.1/sql-syntax.xml 2006-05-26 18:39:49 UTC (rev 2215)
@@ -1904,7 +1904,8 @@
[COMMENT '<replaceable>string</replaceable>'] [<replaceable>reference_definition</replaceable>]
<replaceable>data_type</replaceable>:
- TINYINT[(<replaceable>length</replaceable>)] [UNSIGNED] [ZEROFILL]
+ BIT[(<replaceable>length</replaceable>)]
+ | TINYINT[(<replaceable>length</replaceable>)] [UNSIGNED] [ZEROFILL]
| SMALLINT[(<replaceable>length</replaceable>)] [UNSIGNED] [ZEROFILL]
| MEDIUMINT[(<replaceable>length</replaceable>)] [UNSIGNED] [ZEROFILL]
| INT[(<replaceable>length</replaceable>)] [UNSIGNED] [ZEROFILL]
@@ -1920,8 +1921,10 @@
| TIMESTAMP
| DATETIME
| YEAR
- | CHAR(<replaceable>length</replaceable>) [BINARY | ASCII | UNICODE]
- | VARCHAR(<replaceable>length</replaceable>) [BINARY]
+ | CHAR(<replaceable>length</replaceable>)
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
+ | VARCHAR(<replaceable>length</replaceable>)
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| BINARY(<replaceable>length</replaceable>)
| VARBINARY(<replaceable>length</replaceable>)
| TINYBLOB
@@ -1929,11 +1932,17 @@
| MEDIUMBLOB
| LONGBLOB
| TINYTEXT [BINARY]
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| TEXT [BINARY]
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| MEDIUMTEXT [BINARY]
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| LONGTEXT [BINARY]
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| ENUM(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,<replaceable>value3</replaceable>,...)
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| SET(<replaceable>value1</replaceable>,<replaceable>value2</replaceable>,<replaceable>value3</replaceable>,...)
+ [CHARACTER SET <replaceable>charset_name</replaceable>] [COLLATION <replaceable>collation_name</replaceable>]
| <replaceable>spatial_type</replaceable>
<replaceable>index_col_name</replaceable>:
@@ -2119,6 +2128,13 @@
types, see <xref linkend="spatial-extensions"/>.
</para>
+ <para>
+ Some attributes do not apply to all data types.
+ <literal>AUTO_INCREMENT</literal> applies only to integer types.
+ <literal>DEFAULT</literal> does not apply to the
+ <literal>BLOB</literal> or <literal>TEXT</literal> types.
+ </para>
+
<itemizedlist>
<listitem>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r2215 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 26 May |
