Author: paul
Date: 2007-03-14 17:09:42 +0100 (Wed, 14 Mar 2007)
New Revision: 5352
Log:
r21547@polar: paul | 2007-03-14 10:46:32 -0500
Harmonize roadmap pages.
Modified:
trunk/refman-4.1/introduction.xml
trunk/refman-5.0/introduction.xml
trunk/refman-5.1/introduction.xml
Property changes on: trunk
___________________________________________________________________
Name: svk:merge
- 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:21504
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:17664
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
+ 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:21547
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:17664
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:14593
Modified: trunk/refman-4.1/introduction.xml
===================================================================
--- trunk/refman-4.1/introduction.xml 2007-03-14 15:07:43 UTC (rev 5351)
+++ trunk/refman-4.1/introduction.xml 2007-03-14 16:09:42 UTC (rev 5352)
Changed blocks: 3, Lines Added: 22, Lines Deleted: 10; 2247 bytes
@@ -264,7 +264,7 @@
<title>MySQL Development Roadmap</title>
<para>
- This section provides a snapshot of the MySQL development roadmap,
+ This section describes the general MySQL development roadmap,
including major features implemented in or planned for various
MySQL releases. The following sections provide information for
each release series.
@@ -315,10 +315,6 @@
<entry><emphasis role="bold">MySQL Series</emphasis></entry>
</row>
<row>
- <entry>Foreign keys</entry>
- <entry>3.23 (for the <literal>InnoDB</literal> storage engine)</entry>
- </row>
- <row>
<entry>Unions</entry>
<entry>4.0</entry>
</row>
@@ -347,21 +343,37 @@
<entry>5.0</entry>
</row>
<row>
- <entry>Foreign keys</entry>
- <entry>5.2 (implemented in 3.23 for <literal>InnoDB</literal>)</entry>
- </row>
- <row>
<entry>Triggers</entry>
<entry>5.0 and 5.1</entry>
</row>
<row>
+ <entry>Event scheduler</entry>
+ <entry>5.1</entry>
+ </row>
+ <row>
<entry>Partitioning</entry>
<entry>5.1</entry>
</row>
<row>
- <entry>Row-Based Replication</entry>
+ <entry>Pluggable storage engine API</entry>
<entry>5.1</entry>
</row>
+ <row>
+ <entry>Plugin API</entry>
+ <entry>5.1</entry>
+ </row>
+ <row>
+ <entry>Row-based replication</entry>
+ <entry>5.1</entry>
+ </row>
+ <row>
+ <entry>Server log tables</entry>
+ <entry>5.1</entry>
+ </row>
+ <row>
+ <entry>Foreign keys</entry>
+ <entry>5.2 (implemented in 3.23 for <literal>InnoDB</literal>)</entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml 2007-03-14 15:07:43 UTC (rev 5351)
+++ trunk/refman-5.0/introduction.xml 2007-03-14 16:09:42 UTC (rev 5352)
Changed blocks: 3, Lines Added: 19, Lines Deleted: 11; 2303 bytes
@@ -277,7 +277,7 @@
<title>MySQL Development Roadmap</title>
<para>
- This section provides a snapshot of the MySQL development roadmap,
+ This section describes the general MySQL development roadmap,
including major features implemented in or planned for various
MySQL releases. The following sections provide information for
each release series.
@@ -328,10 +328,6 @@
<entry><emphasis role="bold">MySQL Series</emphasis></entry>
</row>
<row>
- <entry>Foreign keys</entry>
- <entry>3.23 (for the <literal>InnoDB</literal> storage engine)</entry>
- </row>
- <row>
<entry>Unions</entry>
<entry>4.0</entry>
</row>
@@ -360,25 +356,37 @@
<entry>5.0</entry>
</row>
<row>
- <entry>Foreign keys</entry>
- <entry>5.2 (implemented in 3.23 for <literal>InnoDB</literal>)</entry>
- </row>
- <row>
<entry>Triggers</entry>
<entry>5.0 and 5.1</entry>
</row>
<row>
+ <entry>Event scheduler</entry>
+ <entry>5.1</entry>
+ </row>
+ <row>
<entry>Partitioning</entry>
<entry>5.1</entry>
</row>
<row>
- <entry>Pluggable Storage Engine API</entry>
+ <entry>Pluggable storage engine API</entry>
<entry>5.1</entry>
</row>
<row>
- <entry>Row-Based Replication</entry>
+ <entry>Plugin API</entry>
<entry>5.1</entry>
</row>
+ <row>
+ <entry>Row-based replication</entry>
+ <entry>5.1</entry>
+ </row>
+ <row>
+ <entry>Server log tables</entry>
+ <entry>5.1</entry>
+ </row>
+ <row>
+ <entry>Foreign keys</entry>
+ <entry>5.2 (implemented in 3.23 for <literal>InnoDB</literal>)</entry>
+ </row>
</tbody>
</tgroup>
</informaltable>
Modified: trunk/refman-5.1/introduction.xml
===================================================================
--- trunk/refman-5.1/introduction.xml 2007-03-14 15:07:43 UTC (rev 5351)
+++ trunk/refman-5.1/introduction.xml 2007-03-14 16:09:42 UTC (rev 5352)
Changed blocks: 6, Lines Added: 29, Lines Deleted: 24; 3674 bytes
@@ -278,10 +278,11 @@
<title>MySQL Development Roadmap</title>
<para>
- This section describes the general development roadmap, provides
- an overview about features that are new in this current release
- series (¤t-series;), and an overview about upcoming
- additions or changes in the next release series (&next-series;).
+ This section describes the general MySQL development roadmap,
+ provides an overview about features that have been implemented in
+ previous series and that are new in this current release series
+ (¤t-series;), and an overview about upcoming additions or
+ changes in the next release series (&next-series;).
</para>
<para>
@@ -316,27 +317,23 @@
<entry>4.0</entry>
</row>
<row>
- <entry>R-trees</entry>
- <entry>4.1 (for the <literal>MyISAM</literal> storage engine)</entry>
- </row>
- <row>
<entry>Subqueries</entry>
<entry>4.1</entry>
</row>
<row>
- <entry>Cursors</entry>
- <entry>5.0</entry>
+ <entry>R-trees</entry>
+ <entry>4.1 (for the <literal>MyISAM</literal> storage engine)</entry>
</row>
<row>
<entry>Stored procedures</entry>
<entry>5.0</entry>
</row>
<row>
- <entry>Triggers</entry>
- <entry>5.0 and 5.1</entry>
+ <entry>Views</entry>
+ <entry>5.0</entry>
</row>
<row>
- <entry>Views</entry>
+ <entry>Cursors</entry>
<entry>5.0</entry>
</row>
<row>
@@ -344,6 +341,10 @@
<entry>5.0</entry>
</row>
<row>
+ <entry>Triggers</entry>
+ <entry>5.0 and 5.1</entry>
+ </row>
+ <row>
<entry>Event scheduler</entry>
<entry>5.1</entry>
</row>
@@ -352,6 +353,10 @@
<entry>5.1</entry>
</row>
<row>
+ <entry>Pluggable storage engine API</entry>
+ <entry>5.1</entry>
+ </row>
+ <row>
<entry>Plugin API</entry>
<entry>5.1</entry>
</row>
@@ -1282,8 +1287,8 @@
<listitem>
<para>
- <literal>INSERT INTO <replaceable>tbl_name</replaceable> SET
- <replaceable>col_name</replaceable> = ...</literal>
+ <literal>INSERT INTO <replaceable>tbl_name</replaceable>
+ SET <replaceable>col_name</replaceable> = ...</literal>
syntax.
</para>
</listitem>
@@ -2508,15 +2513,15 @@
<formalpara role="mnmas">
- <title>MySQL Enterprise</title>
-
- <para>
- To be alerted when there is no form of server-enforced data integrity,
- subscribe to the MySQL Network Monitoring and Advisory Service. For more
- information see
- <ulink url="&base-url-enterprise;advisors.html" />.
- </para>
-
+ <title>MySQL Enterprise</title>
+
+ <para>
+ To be alerted when there is no form of server-enforced data
+ integrity, subscribe to the MySQL Network Monitoring and
+ Advisory Service. For more information see
+ <ulink url="&base-url-enterprise;advisors.html" />.
+ </para>
+
</formalpara>
<para>
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r5352 - in trunk: . refman-4.1 refman-5.0 refman-5.1 | paul | 14 Mar |
