Below is the list of changes that have just been committed into a local
mysqldoc repository of paul. When paul does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://www.mysql.com/doc/I/n/Installing_source_tree.html
ChangeSet
1.3641 05/09/28 11:47:37 paul@stripped +7 -0
COMMENT -> CONNECTION for FEDERATED
refman/storage-engines.xml
1.27 05/09/28 11:47:36 paul@stripped +15 -10
COMMENT -> CONNECTION for FEDERATED
refman/sql-syntax.xml
1.77 05/09/28 11:47:35 paul@stripped +15 -1
COMMENT -> CONNECTION for FEDERATED
refman-common/news-5.0.xml
1.232 05/09/28 11:47:35 paul@stripped +28 -16
COMMENT -> CONNECTION for FEDERATED
refman-5.1/storage-engines.xml
1.20 05/09/28 11:47:35 paul@stripped +16 -11
Sync.
refman-5.1/sql-syntax.xml
1.55 05/09/28 11:47:35 paul@stripped +21 -6
Sync.
refman-5.0/storage-engines.xml
1.20 05/09/28 11:47:35 paul@stripped +16 -11
Sync.
refman-5.0/sql-syntax.xml
1.52 05/09/28 11:47:35 paul@stripped +21 -6
Sync.
# This is a BitKeeper patch. What follows are the unified diffs for the
# set of deltas contained in the patch. The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User: paul
# Host: kite-hub.kitebird.com
# Root: /src/extern/MySQL/bk/mysqldoc
--- 1.54/refman-5.1/sql-syntax.xml 2005-09-27 11:35:01 -05:00
+++ 1.55/refman-5.1/sql-syntax.xml 2005-09-28 11:47:35 -05:00
@@ -1467,6 +1467,7 @@
| [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]
| CHECKSUM = {0 | 1}
| COMMENT = '<replaceable>string</replaceable>'
+ | CONNECTION = '<replaceable>connect_string</replaceable>'
| MAX_ROWS = <replaceable>value</replaceable>
| MIN_ROWS = <replaceable>value</replaceable>
| PACK_KEYS = {0 | 1 | DEFAULT}
@@ -1531,12 +1532,13 @@
<remark>
description_for_help_topic CREATE TABLE ENGINE TYPE KEY CREATE
DATA ACTION ARCHIVE AVG_ROW_LENGTH BERKELEYDB BDB BY CASCADE
- CHECK CHECKSUM COMMENT COMPACT CONSTRAINT COMPRESSED CSV
- FEDERATED FIXED DYNAMIC DEFAULT DELAY_KEY_WRITE DELETE DIRECTORY
- INDEX FIRST FOREIGN RAID_TYPE RAID_CHUNKS RAID_CHUNKSIZE
- ROW_FORMAT FULL FULLTEXT HEAP INNOBASE INNODB ISAM INSERT_METHOD
- MAX_ROWS MIN_ROWS PACK_KEYS PARTIAL RAID0 STRIPED MERGE
- MRG_MYISAM MYISAM NDB NDBCLUSTER NO REDUNDANT REFERENCES SERIAL
+ CHECK CHECKSUM COMMENT COMPACT CONNECTION CONSTRAINT COMPRESSED
+ CSV FEDERATED FIXED DYNAMIC DEFAULT DELAY_KEY_WRITE DELETE
+ DIRECTORY INDEX FIRST FOREIGN RAID_TYPE RAID_CHUNKS
+ RAID_CHUNKSIZE ROW_FORMAT FULL FULLTEXT HEAP INNOBASE INNODB
+ ISAM INSERT_METHOD MAX_ROWS MIN_ROWS PACK_KEYS PARTIAL RAID0
+ STRIPED MERGE MRG_MYISAM MYISAM NDB NDBCLUSTER NO REDUNDANT
+ REFERENCES SERIAL
</remark>
<para>
@@ -2494,6 +2496,19 @@
<para>
A comment for your table, up to 60 characters long.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>CONNECTION</literal>
+ </para>
+
+ <para>
+ The connection string for a <literal>FEDERATED</literal>
+ table. This option is available as of MySQL 5.0.13; before
+ that, use a <literal>COMMENT</literal> option for the
+ connection string.
</para>
</listitem>
--- 1.19/refman-5.1/storage-engines.xml 2005-09-14 13:01:25 -05:00
+++ 1.20/refman-5.1/storage-engines.xml 2005-09-28 11:47:35 -05:00
@@ -3406,8 +3406,8 @@
<remark role="todo">
Stuff we could cover: - If federated table is replicated, the
- the slave hosts must be able to use the account in the COMMENT
- to connect to the remote server.
+ the slave hosts must be able to use the account in the
+ CONNECTION to connect to the remote server.
</remark>
<para>
@@ -3461,16 +3461,21 @@
)
ENGINE=FEDERATED
DEFAULT CHARSET=latin1
-COMMENT='mysql://root@remote_host:9306/federated/test_table';
+CONNECTION='mysql://root@remote_host:9306/federated/test_table';
</programlisting>
<para>
+ (Before MySQL 5.0.13, use <literal>COMMENT</literal> rather than
+ <literal>CONNECTION</literal>.)
+ </para>
+
+ <para>
The structure of this table must be exactly the same as that of
the remote table, except that the <literal>ENGINE</literal>
table option should be <literal>FEDERATED</literal> and the
- <literal>COMMENT</literal> table option is a connection string
- that indicates to the <literal>FEDERATED</literal> engine how to
- connect to the remote server.
+ <literal>CONNECTION</literal> table option is a connection
+ string that indicates to the <literal>FEDERATED</literal> engine
+ how to connect to the remote server.
</para>
<para>
@@ -3490,7 +3495,7 @@
<para>
The general form of the connection string in the
- <literal>COMMENT</literal> option is as follows:
+ <literal>CONNECTION</literal> option is as follows:
</para>
<programlisting>
@@ -3508,13 +3513,13 @@
</para>
<programlisting>
-COMMENT='mysql://username:password@hostname:port/database/tablename'
-COMMENT='mysql://username@hostname/database/tablename'
-COMMENT='mysql://username:password@hostname/database/tablename'
+CONNECTION='mysql://username:password@hostname:port/database/tablename'
+CONNECTION='mysql://username@hostname/database/tablename'
+CONNECTION='mysql://username:password@hostname/database/tablename'
</programlisting>
<para>
- The use of <literal>COMMENT</literal> for specifying the
+ The use of <literal>CONNECTION</literal> for specifying the
connection string is non-optimal and is likely to change in
MySQL 5.1. Keep this in mind when you use
<literal>FEDERATED</literal> tables, because it means that
--- 1.231/refman-common/news-5.0.xml 2005-09-27 21:25:50 -05:00
+++ 1.232/refman-common/news-5.0.xml 2005-09-28 11:47:35 -05:00
@@ -230,18 +230,20 @@
<para>
Multi-table <literal>UPDATE</literal> and
<literal>DELETE</literal> statements that do not affect any
- rows are now written to the binary log and will replicate. (Bug #13348, Bug #12844)
+ rows are now written to the binary log and will replicate.
+ (Bug #13348, Bug #12844)
</para>
</listitem>
-
+
<listitem>
<para>
Range scans can now be performed for queries on VIEWs such as
- <literal>column IN (<constants>)</literal> and <literal>column
- BETWEEN ConstantA AND ConstantB</literal>. (Bug #13317)
+ <literal>column IN (<constants>)</literal> and
+ <literal>column BETWEEN ConstantA AND ConstantB</literal>.
+ (Bug #13317)
</para>
</listitem>
-
+
</itemizedlist>
<para>
@@ -362,6 +364,14 @@
<listitem>
<para>
+ The connection string for <literal>FEDERATED</literal> tables
+ now is specified using a <literal>CONNECTION</literal> table
+ option rather than a <literal>COMMENT</literal> table option.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
Better detection of connection timeout for replication servers
on Windows allows elimination of extraneous <literal>Lost
connection</literal> errors in the error log. (Bug #5588)
@@ -454,16 +464,18 @@
<listitem>
<para>
- The Windows binary packages are now compiled with the Microsoft
- Visual Studio 2003 compiler instead of Microsoft Visual C++ 6.0.
+ The Windows binary packages are now compiled with the
+ Microsoft Visual Studio 2003 compiler instead of Microsoft
+ Visual C++ 6.0.
</para>
</listitem>
<listitem>
<para>
- The binaries compiled with the Intel icc compiler are now built using
- icc 9.0 instead of icc 8.1. You will have to install new versions of
- the Intel icc runtime libraries, which are available from here:
+ The binaries compiled with the Intel icc compiler are now
+ built using icc 9.0 instead of icc 8.1. You will have to
+ install new versions of the Intel icc runtime libraries, which
+ are available from here:
(<ulink url="http://dev.mysql.com/downloads/os-linux.html">
http://dev.mysql.com/downloads/os-linux.html</ulink>)
</para>
@@ -626,7 +638,8 @@
<para>
Performing an <literal>IS NULL</literal> check on the
<literal>MIN()</literal> or <literal>MAX()</literal> of an
- indexed column in a complex query could produce incorrect results. (Bug #12695)
+ indexed column in a complex query could produce incorrect
+ results. (Bug #12695)
</para>
</listitem>
@@ -1296,11 +1309,10 @@
<listitem>
<para>
- <literal>CHECKSUM TABLE</literal> command returned
- incorrect results for tables with deleted rows. After
- upgrading, users who used stored checksum information to
- detect table changes should rebuild their checksum data. (Bug
- #12296)
+ <literal>CHECKSUM TABLE</literal> command returned incorrect
+ results for tables with deleted rows. After upgrading, users
+ who used stored checksum information to detect table changes
+ should rebuild their checksum data. (Bug #12296)
</para>
</listitem>
--- 1.76/refman/sql-syntax.xml 2005-09-21 17:57:30 -05:00
+++ 1.77/refman/sql-syntax.xml 2005-09-28 11:47:35 -05:00
@@ -1275,6 +1275,7 @@
| [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]
| CHECKSUM = {0 | 1}
| COMMENT = '<replaceable>string</replaceable>'
+ | CONNECTION = '<replaceable>connect_string</replaceable>'
| MAX_ROWS = <replaceable>value</replaceable>
| MIN_ROWS = <replaceable>value</replaceable>
| PACK_KEYS = {0 | 1 | DEFAULT}
@@ -1293,7 +1294,7 @@
[IGNORE | REPLACE] [AS] SELECT ... (<replaceable>Some legal select statement</replaceable>)
</programlisting>
-<!-- description_for_help_topic CREATE TABLE ENGINE TYPE KEY CREATE DATA ACTION ARCHIVE AVG_ROW_LENGTH BERKELEYDB BDB BY CASCADE CHECK CHECKSUM COMMENT COMPACT CONSTRAINT COMPRESSED CSV FEDERATED FIXED DYNAMIC DEFAULT DELAY_KEY_WRITE DELETE DIRECTORY INDEX FIRST FOREIGN RAID_TYPE RAID_CHUNKS RAID_CHUNKSIZE ROW_FORMAT FULL FULLTEXT HEAP INNOBASE INNODB ISAM INSERT_METHOD MAX_ROWS MIN_ROWS PACK_KEYS PARTIAL RAID0 STRIPED MERGE MRG_MYISAM MYISAM NDB NDBCLUSTER NO REDUNDANT REFERENCES SERIAL -->
+<!-- description_for_help_topic CREATE TABLE ENGINE TYPE KEY CREATE DATA ACTION ARCHIVE AVG_ROW_LENGTH BERKELEYDB BDB BY CASCADE CHECK CHECKSUM COMMENT COMPACT CONNECTION CONSTRAINT COMPRESSED CSV FEDERATED FIXED DYNAMIC DEFAULT DELAY_KEY_WRITE DELETE DIRECTORY INDEX FIRST FOREIGN RAID_TYPE RAID_CHUNKS RAID_CHUNKSIZE ROW_FORMAT FULL FULLTEXT HEAP INNOBASE INNODB ISAM INSERT_METHOD MAX_ROWS MIN_ROWS PACK_KEYS PARTIAL RAID0 STRIPED MERGE MRG_MYISAM MYISAM NDB NDBCLUSTER NO REDUNDANT REFERENCES SERIAL -->
<para>
<literal>CREATE TABLE</literal> creates a table with the given
@@ -2265,6 +2266,19 @@
<para>
A comment for your table, up to 60 characters long.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>CONNECTION</literal>
+ </para>
+
+ <para>
+ The connection string for a <literal>FEDERATED</literal>
+ table. This option is available as of MySQL 5.0.13; before
+ that, use a <literal>COMMENT</literal> option for the
+ connection string.
</para>
</listitem>
--- 1.26/refman/storage-engines.xml 2005-09-14 13:01:25 -05:00
+++ 1.27/refman/storage-engines.xml 2005-09-28 11:47:36 -05:00
@@ -3453,7 +3453,7 @@
<!-- TODO: Stuff we could cover:
- If federated table is replicated, the the slave hosts must be
- able to use the account in the COMMENT to connect to the remote
+ able to use the account in the CONNECTION to connect to the remote
server. -->
<para>
@@ -3509,16 +3509,21 @@
)
ENGINE=FEDERATED
DEFAULT CHARSET=latin1
-COMMENT='mysql://root@remote_host:9306/federated/test_table';
+CONNECTION='mysql://root@remote_host:9306/federated/test_table';
</programlisting>
<para>
+ (Before MySQL 5.0.13, use <literal>COMMENT</literal> rather than
+ <literal>CONNECTION</literal>.)
+ </para>
+
+ <para>
The structure of this table must be exactly the same as the
remote table, except that the <literal>ENGINE</literal> table
option should be <literal>FEDERATED</literal> and the
- <literal>COMMENT</literal> table option is a connection string
- that indicates to the <literal>FEDERATED</literal> engine how to
- connect to the remote server.
+ <literal>CONNECTION</literal> table option is a connection
+ string that indicates to the <literal>FEDERATED</literal> engine
+ how to connect to the remote server.
</para>
<para>
@@ -3539,7 +3544,7 @@
<para>
The general form of the connection string in the
- <literal>COMMENT</literal> option is as follows:
+ <literal>CONNECTION</literal> option is as follows:
</para>
<programlisting>
@@ -3557,13 +3562,13 @@
</para>
<programlisting>
-COMMENT='mysql://username:password@hostname:port/database/tablename'
-COMMENT='mysql://username@hostname/database/tablename'
-COMMENT='mysql://username:password@hostname/database/tablename'
+CONNECTION='mysql://username:password@hostname:port/database/tablename'
+CONNECTION='mysql://username@hostname/database/tablename'
+CONNECTION='mysql://username:password@hostname/database/tablename'
</programlisting>
<para>
- The use of <literal>COMMENT</literal> for specifying the
+ The use of <literal>CONNECTION</literal> for specifying the
connection string is non-optimal and will likely change in MySQL
5.1. Keep this in mind when you use <literal>FEDERATED</literal>
tables, because it means you'll need to make some modifications
--- 1.51/refman-5.0/sql-syntax.xml 2005-09-21 17:57:30 -05:00
+++ 1.52/refman-5.0/sql-syntax.xml 2005-09-28 11:47:35 -05:00
@@ -1303,6 +1303,7 @@
| [DEFAULT] CHARACTER SET <replaceable>charset_name</replaceable> [COLLATE <replaceable>collation_name</replaceable>]
| CHECKSUM = {0 | 1}
| COMMENT = '<replaceable>string</replaceable>'
+ | CONNECTION = '<replaceable>connect_string</replaceable>'
| MAX_ROWS = <replaceable>value</replaceable>
| MIN_ROWS = <replaceable>value</replaceable>
| PACK_KEYS = {0 | 1 | DEFAULT}
@@ -1324,12 +1325,13 @@
<remark>
description_for_help_topic CREATE TABLE ENGINE TYPE KEY CREATE
DATA ACTION ARCHIVE AVG_ROW_LENGTH BERKELEYDB BDB BY CASCADE
- CHECK CHECKSUM COMMENT COMPACT CONSTRAINT COMPRESSED CSV
- FEDERATED FIXED DYNAMIC DEFAULT DELAY_KEY_WRITE DELETE DIRECTORY
- INDEX FIRST FOREIGN RAID_TYPE RAID_CHUNKS RAID_CHUNKSIZE
- ROW_FORMAT FULL FULLTEXT HEAP INNOBASE INNODB ISAM INSERT_METHOD
- MAX_ROWS MIN_ROWS PACK_KEYS PARTIAL RAID0 STRIPED MERGE
- MRG_MYISAM MYISAM NDB NDBCLUSTER NO REDUNDANT REFERENCES SERIAL
+ CHECK CHECKSUM COMMENT COMPACT CONNECTION CONSTRAINT COMPRESSED
+ CSV FEDERATED FIXED DYNAMIC DEFAULT DELAY_KEY_WRITE DELETE
+ DIRECTORY INDEX FIRST FOREIGN RAID_TYPE RAID_CHUNKS
+ RAID_CHUNKSIZE ROW_FORMAT FULL FULLTEXT HEAP INNOBASE INNODB
+ ISAM INSERT_METHOD MAX_ROWS MIN_ROWS PACK_KEYS PARTIAL RAID0
+ STRIPED MERGE MRG_MYISAM MYISAM NDB NDBCLUSTER NO REDUNDANT
+ REFERENCES SERIAL
</remark>
<para>
@@ -2287,6 +2289,19 @@
<para>
A comment for your table, up to 60 characters long.
+ </para>
+ </listitem>
+
+ <listitem>
+ <para>
+ <literal>CONNECTION</literal>
+ </para>
+
+ <para>
+ The connection string for a <literal>FEDERATED</literal>
+ table. This option is available as of MySQL 5.0.13; before
+ that, use a <literal>COMMENT</literal> option for the
+ connection string.
</para>
</listitem>
--- 1.19/refman-5.0/storage-engines.xml 2005-09-14 13:01:25 -05:00
+++ 1.20/refman-5.0/storage-engines.xml 2005-09-28 11:47:35 -05:00
@@ -3406,8 +3406,8 @@
<remark role="todo">
Stuff we could cover: - If federated table is replicated, the
- the slave hosts must be able to use the account in the COMMENT
- to connect to the remote server.
+ the slave hosts must be able to use the account in the
+ CONNECTION to connect to the remote server.
</remark>
<para>
@@ -3461,16 +3461,21 @@
)
ENGINE=FEDERATED
DEFAULT CHARSET=latin1
-COMMENT='mysql://root@remote_host:9306/federated/test_table';
+CONNECTION='mysql://root@remote_host:9306/federated/test_table';
</programlisting>
<para>
+ (Before MySQL 5.0.13, use <literal>COMMENT</literal> rather than
+ <literal>CONNECTION</literal>.)
+ </para>
+
+ <para>
The structure of this table must be exactly the same as that of
the remote table, except that the <literal>ENGINE</literal>
table option should be <literal>FEDERATED</literal> and the
- <literal>COMMENT</literal> table option is a connection string
- that indicates to the <literal>FEDERATED</literal> engine how to
- connect to the remote server.
+ <literal>CONNECTION</literal> table option is a connection
+ string that indicates to the <literal>FEDERATED</literal> engine
+ how to connect to the remote server.
</para>
<para>
@@ -3490,7 +3495,7 @@
<para>
The general form of the connection string in the
- <literal>COMMENT</literal> option is as follows:
+ <literal>CONNECTION</literal> option is as follows:
</para>
<programlisting>
@@ -3508,13 +3513,13 @@
</para>
<programlisting>
-COMMENT='mysql://username:password@hostname:port/database/tablename'
-COMMENT='mysql://username@hostname/database/tablename'
-COMMENT='mysql://username:password@hostname/database/tablename'
+CONNECTION='mysql://username:password@hostname:port/database/tablename'
+CONNECTION='mysql://username@hostname/database/tablename'
+CONNECTION='mysql://username:password@hostname/database/tablename'
</programlisting>
<para>
- The use of <literal>COMMENT</literal> for specifying the
+ The use of <literal>CONNECTION</literal> for specifying the
connection string is non-optimal and is likely to change in
MySQL 5.1. Keep this in mind when you use
<literal>FEDERATED</literal> tables, because it means that
| Thread |
|---|
| • bk commit - mysqldoc@docsrva tree (paul:1.3641) | paul | 28 Sep |
