svn commit - mysqldoc@docsrva: r17450 - in trunk: . refman-5.4 refman-5.5 refman-6.0.sav

[paul.dubois]

Author: paul
Date: 2009-11-04 22:04:40 +0100 (Wed, 04 Nov 2009)
New Revision: 17450

Log:
 r46122@frost:  paul | 2009-11-04 14:56:04 -0500
 Harmonize version differences


Modified:
   trunk/refman-5.4/backup.xml
   trunk/refman-5.5/backup.xml
   trunk/refman-6.0.sav/backup.xml

Property changes on: trunk
___________________________________________________________________
Name: svk:merge
   - 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:27523
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
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:46112
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:39546
   + 07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/mysqldoc/trunk:27523
07c7e7b4-24e3-4b51-89d0-6dc09fec6bec:/mysqldoc-local/trunk:25547
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:46122
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:39546


Modified: trunk/refman-5.4/backup.xml
===================================================================
--- trunk/refman-5.4/backup.xml	2009-11-04 20:57:06 UTC (rev 17449)
+++ trunk/refman-5.4/backup.xml	2009-11-04 21:04:40 UTC (rev 17450)
Changed blocks: 2, Lines Added: 14, Lines Deleted: 6; 1646 bytes

@@ -249,10 +249,9 @@
             (such as <command>cp</command>,
<command>scp</command>,
             <command>tar</command>, <command>rsync</command>),
             <command>mysqlhotcopy</command> for
-            <literal>MyISAM</literal> tables,
+            <literal>MyISAM</literal> tables, or
             <command>ibbackup</command> for
<literal>InnoDB</literal>
-            tables, or <literal>START BACKUP</literal> for
-            <literal role="se">NDB</literal> tables.
+            tables.
           </para>
 
           <para>

@@ -499,10 +498,19 @@
       <para>
         MySQL Cluster provides a high-availability, high-redundancy
         version of MySQL adapted for the distributed computing
-        environment. See <xref linkend="mysql-cluster"/>. For
-        information specifically about MySQL Cluster backup, see
-        <xref linkend="mysql-cluster-backup"/>.
+        environment. See <xref linkend="refman-5.1:mysql-cluster"/>,
+        which provides information about MySQL Cluster NDB 6.2 and 6.3
+        (based on MySQL 5.1 but containing the latest improvements and
+        fixes for the <literal role="se">NDBCLUSTER</literal> storage
+        engine).
       </para>
+
+      <note>
+        <para>
+          The <literal role="se">NDBCLUSTER</literal> storage engine is
+          currently not supported in MySQL &current-series;.
+        </para>
+      </note>
     </listitem>
 
     <listitem>


Modified: trunk/refman-5.5/backup.xml
===================================================================
--- trunk/refman-5.5/backup.xml	2009-11-04 20:57:06 UTC (rev 17449)
+++ trunk/refman-5.5/backup.xml	2009-11-04 21:04:40 UTC (rev 17450)
Changed blocks: 2, Lines Added: 14, Lines Deleted: 6; 1646 bytes

@@ -249,10 +249,9 @@
             (such as <command>cp</command>,
<command>scp</command>,
             <command>tar</command>, <command>rsync</command>),
             <command>mysqlhotcopy</command> for
-            <literal>MyISAM</literal> tables,
+            <literal>MyISAM</literal> tables, or
             <command>ibbackup</command> for
<literal>InnoDB</literal>
-            tables, or <literal>START BACKUP</literal> for
-            <literal role="se">NDB</literal> tables.
+            tables.
           </para>
 
           <para>

@@ -499,10 +498,19 @@
       <para>
         MySQL Cluster provides a high-availability, high-redundancy
         version of MySQL adapted for the distributed computing
-        environment. See <xref linkend="mysql-cluster"/>. For
-        information specifically about MySQL Cluster backup, see
-        <xref linkend="mysql-cluster-backup"/>.
+        environment. See <xref linkend="refman-5.1:mysql-cluster"/>,
+        which provides information about MySQL Cluster NDB 6.2 and 6.3
+        (based on MySQL 5.1 but containing the latest improvements and
+        fixes for the <literal role="se">NDBCLUSTER</literal> storage
+        engine).
       </para>
+
+      <note>
+        <para>
+          The <literal role="se">NDBCLUSTER</literal> storage engine is
+          currently not supported in MySQL &current-series;.
+        </para>
+      </note>
     </listitem>
 
     <listitem>


Modified: trunk/refman-6.0.sav/backup.xml
===================================================================
--- trunk/refman-6.0.sav/backup.xml	2009-11-04 20:57:06 UTC (rev 17449)
+++ trunk/refman-6.0.sav/backup.xml	2009-11-04 21:04:40 UTC (rev 17450)
Changed blocks: 2, Lines Added: 3, Lines Deleted: 4; 1056 bytes

@@ -249,10 +249,9 @@
             (such as <command>cp</command>,
<command>scp</command>,
             <command>tar</command>, <command>rsync</command>),
             <command>mysqlhotcopy</command> for
-            <literal>MyISAM</literal> tables,
+            <literal>MyISAM</literal> tables, or
             <command>ibbackup</command> for
<literal>InnoDB</literal>
-            tables, or <literal>START BACKUP</literal> for
-            <literal role="se">NDB</literal> tables.
+            tables.
           </para>
 
           <para>

@@ -509,7 +508,7 @@
       <note>
         <para>
           The <literal role="se">NDBCLUSTER</literal> storage engine is
-          currently not supported in MySQL 6.0.
+          currently not supported in MySQL &current-series;.
         </para>
       </note>
     </listitem>