svn commit - mysqldoc@docsrva: r8535 - in trunk: . refman-5.0 refman-5.1 refman-6.0

[paul]

Author: paul
Date: 2007-11-05 19:48:41 +0100 (Mon, 05 Nov 2007)
New Revision: 8535

Log:
 r32352@polar:  paul | 2007-11-05 12:23:23 -0600
 Update some version numbers.


Modified:
   trunk/refman-5.0/faqs.xml
   trunk/refman-5.0/information-schema.xml
   trunk/refman-5.0/introduction.xml
   trunk/refman-5.1/faqs.xml
   trunk/refman-5.1/information-schema.xml
   trunk/refman-5.1/sql-syntax.xml
   trunk/refman-6.0/faqs.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32346
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26562
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581
   + 4767c598-dc10-0410-bea0-d01b485662eb:/mysqldoc-local/mysqldoc/trunk:32352
7d8d2c4e-af1d-0410-ab9f-b038ce55645b:/mysqldoc-local/mysqldoc:26562
b5ec3a16-e900-0410-9ad2-d183a3acac99:/mysqldoc-local/mysqldoc/trunk:14218
bf112a9c-6c03-0410-a055-ad865cd57414:/mysqldoc-local/mysqldoc/trunk:21581


Modified: trunk/refman-5.0/faqs.xml
===================================================================
--- trunk/refman-5.0/faqs.xml	2007-11-05 17:06:09 UTC (rev 8534)
+++ trunk/refman-5.0/faqs.xml	2007-11-05 18:48:41 UTC (rev 8535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 673 bytes

@@ -236,7 +236,7 @@
             The foreign key support in <literal>InnoDB</literal> has
             seen improvements in each major version of MySQL. Foreign
             key support generic to all storage engines is scheduled for
-            MySQL 5.2; this should resolve any inadequacies in the
+            MySQL 6.x; this should resolve any inadequacies in the
             current storage engine specific implementation.
           </para>
 


Modified: trunk/refman-5.0/information-schema.xml
===================================================================
--- trunk/refman-5.0/information-schema.xml	2007-11-05 17:06:09 UTC (rev 8534)
+++ trunk/refman-5.0/information-schema.xml	2007-11-05 18:48:41 UTC (rev 8535)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 1; 618 bytes

@@ -3525,7 +3525,8 @@
       acknowledge the need for the <literal>PARAMETERS</literal> and
       <literal>REFERENTIAL_CONSTRAINTS</literal> tables.
       (<literal>REFERENTIAL_CONSTRAINTS</literal> is implemented in
-      MySQL 5.1.)
+      MySQL 5.1, and <literal>PARAMETERS</literal> is implemented in
+      MySQL 6.0.)
     </para>
 
   </section>


Modified: trunk/refman-5.0/introduction.xml
===================================================================
--- trunk/refman-5.0/introduction.xml	2007-11-05 17:06:09 UTC (rev 8534)
+++ trunk/refman-5.0/introduction.xml	2007-11-05 18:48:41 UTC (rev 8535)
Changed blocks: 2, Lines Added: 2, Lines Deleted: 2; 928 bytes

@@ -377,7 +377,7 @@
           </row>
           <row>
             <entry>Foreign keys</entry>
-            <entry>5.2 (implemented in 3.23 for
<literal>InnoDB</literal>)</entry>
+            <entry>6.x (implemented in 3.23 for
<literal>InnoDB</literal>)</entry>
           </row>
         </tbody>
       </tgroup>

@@ -2558,7 +2558,7 @@
           foreign keys. See
           <xref linkend="innodb-foreign-key-constraints"/>. Foreign key
           support in <literal>MyISAM</literal> tables is scheduled for
-          implementation in MySQL 5.2. See <xref linkend="roadmap"/>.
+          implementation in MySQL 6.x. See <xref linkend="roadmap"/>.
         </para>
 
       </section>


Modified: trunk/refman-5.1/faqs.xml
===================================================================
--- trunk/refman-5.1/faqs.xml	2007-11-05 17:06:09 UTC (rev 8534)
+++ trunk/refman-5.1/faqs.xml	2007-11-05 18:48:41 UTC (rev 8535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 673 bytes

@@ -236,7 +236,7 @@
             The foreign key support in <literal>InnoDB</literal> has
             seen improvements in each major version of MySQL. Foreign
             key support generic to all storage engines is scheduled for
-            MySQL 5.2; this should resolve any inadequacies in the
+            MySQL 6.x; this should resolve any inadequacies in the
             current storage engine specific implementation.
           </para>
 


Modified: trunk/refman-5.1/information-schema.xml
===================================================================
--- trunk/refman-5.1/information-schema.xml	2007-11-05 17:06:09 UTC (rev 8534)
+++ trunk/refman-5.1/information-schema.xml	2007-11-05 18:48:41 UTC (rev 8535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 0; 568 bytes

@@ -5761,6 +5761,7 @@
       We intend to implement additional
       <literal>INFORMATION_SCHEMA</literal> tables. In particular, we
       acknowledge the need for the <literal>PARAMETERS</literal> table.
+      (<literal>PARAMETERS</literal> is implemented in MySQL 6.0.)
     </para>
 
   </section>


Modified: trunk/refman-5.1/sql-syntax.xml
===================================================================
--- trunk/refman-5.1/sql-syntax.xml	2007-11-05 17:06:09 UTC (rev 8534)
+++ trunk/refman-5.1/sql-syntax.xml	2007-11-05 18:48:41 UTC (rev 8535)
Changed blocks: 1, Lines Added: 2, Lines Deleted: 2; 936 bytes

@@ -3825,8 +3825,8 @@
           <literal>ENGINE</literal>. <literal>TYPE</literal> has
been
           deprecated since MySQL 4.0 but is still supported for
           backwards compatibility in MySQL 5.1 (excepting MySQL 5.1.7).
-          Since MySQL 5.1.8, it produces a warning. It is scheduled for
-          removal in MySQL 5.2. <emphasis>You should not use
+          Since MySQL 5.1.8, it produces a warning. It is removed as of
+          MySQL 5.2. <emphasis>You should not use
           <literal>TYPE</literal> in any new applications, and you
           should immediately begin conversion of existing applications
           to use <literal>ENGINE</literal> instead</emphasis>. (See


Modified: trunk/refman-6.0/faqs.xml
===================================================================
--- trunk/refman-6.0/faqs.xml	2007-11-05 17:06:09 UTC (rev 8534)
+++ trunk/refman-6.0/faqs.xml	2007-11-05 18:48:41 UTC (rev 8535)
Changed blocks: 1, Lines Added: 1, Lines Deleted: 1; 673 bytes

@@ -236,7 +236,7 @@
             The foreign key support in <literal>InnoDB</literal> has
             seen improvements in each major version of MySQL. Foreign
             key support generic to all storage engines is scheduled for
-            MySQL 5.2; this should resolve any inadequacies in the
+            MySQL 6.x; this should resolve any inadequacies in the
             current storage engine specific implementation.
           </para>