svn commit - mysqldoc@docsrva: r15562 - in trunk: . refman-6.0

[paul.dubois]

Author: paul
Date: 2009-07-02 20:49:17 +0200 (Thu, 02 Jul 2009)
New Revision: 15562

Log:
 r42635@frost:  paul | 2009-07-02 12:27:09 -0500
 Parameterize series number


Modified:
   trunk/refman-6.0/optimization.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:42627
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39180
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:43968
4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/trunk:44480
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:42635
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:39036
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/trunk:39180


Modified: trunk/refman-6.0/optimization.xml
===================================================================
--- trunk/refman-6.0/optimization.xml	2009-07-02 17:02:55 UTC (rev 15561)
+++ trunk/refman-6.0/optimization.xml	2009-07-02 18:49:17 UTC (rev 15562)
Changed blocks: 2, Lines Added: 11, Lines Deleted: 10; 2029 bytes

@@ -3750,11 +3750,12 @@
           The <literal role="se">NDBCLUSTER</literal> storage engine
           used by MySQL Cluster also supports condition pushdown;
           however, this storage engine is currently not available in
-          MySQL 6.0. If you are interested in using MySQL Cluster, see
-          <xref linkend="refman-5.1:mysql-cluster"/>, which provides
-          information about MySQL Cluster NDB 6.2 and 6.3, which are
-          based on MySQL 5.1 but contain the latest improvements and
-          fixes for <literal role="se">NDBCLUSTER</literal>.
+          MySQL &current-series;. If you are interested in using MySQL
+          Cluster, see <xref linkend="refman-5.1:mysql-cluster"/>, which
+          provides information about MySQL Cluster NDB 6.2 and 6.3,
+          which are based on MySQL 5.1 but contain the latest
+          improvements and fixes for
+          <literal role="se">NDBCLUSTER</literal>.
         </para>
       </note>
 

@@ -12808,11 +12809,11 @@
 
           <note>
             <para>
-              MySQL Cluster is currently not supported in MySQL 6.0.
-              Users wishing to upgrade a MySQL Cluster from MySQL 5.0 or
-              5.1 should instead migrate to MySQL Cluster NDB 6.2 or
-              6.3; these are based on MySQL 5.1 but contain the latest
-              improvements and fixes for
+              MySQL Cluster is currently not supported in MySQL
+              &current-series;. Users wishing to upgrade a MySQL Cluster
+              from MySQL 5.0 or 5.1 should instead migrate to MySQL
+              Cluster NDB 6.2 or 6.3; these are based on MySQL 5.1 but
+              contain the latest improvements and fixes for
               <literal role="se">NDBCLUSTER</literal>.
             </para>
           </note>