List:Commits« Previous MessageNext Message »
From:jon Date:April 24 2007 2:31am
Subject:svn commit - mysqldoc@docsrva: r6100 - trunk/refman-5.1
View as plain text  
Author: jstephens
Date: 2007-04-24 04:31:48 +0200 (Tue, 24 Apr 2007)
New Revision: 6100

Log:

Reformat.



Modified:
   trunk/refman-5.1/mysql-cluster.xml
   trunk/refman-5.1/news-5.1.xml


Modified: trunk/refman-5.1/mysql-cluster.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster.xml	2007-04-24 02:30:24 UTC (rev 6099)
+++ trunk/refman-5.1/mysql-cluster.xml	2007-04-24 02:31:48 UTC (rev 6100)
Changed blocks: 16, Lines Added: 115, Lines Deleted: 90; 14175 bytes

@@ -8820,7 +8820,7 @@
             changes in the cluster system tables.
           </para>
         </listitem>
-        
+
         <listitem>
           <para>
             Online upgrades from MySQL 5.1.17 and earlier to 5.1.18 and

@@ -8829,8 +8829,9 @@
             <literal>mysql.ndb_apply_status</literal> table. However, it
             should not be necessary to shut down the cluster entirely,
             if you follow this modified rolling restart procedure:
-            
+
             <orderedlist>
+
               <listitem>
                 <para>
                   Stop the management server, update the

@@ -8839,17 +8840,17 @@
                   step for each management server in turn.
                 </para>
               </listitem>
-              
+
               <listitem>
                 <para>
                   For each data node in turn: Stop the data node,
                   replace the <literal>ndbd</literal> binary with the
                   new version, then restart the data node. It is not
                   necessary to use <literal>--initial</literal> when
-                  restarting any of the data nodes. 
+                  restarting any of the data nodes.
                 </para>
               </listitem>
-              
+
               <listitem>
                 <para>
                   Stop <emphasis>all</emphasis> SQL nodes. Replace the

@@ -8863,14 +8864,15 @@
                   <literal>mysql.ndb_apply_status</literal> uses the
                   <literal>NDB</literal> storage engine and is thus
                   shared between all SQL nodes &mdash; there may be
-                  conflicts between MySQL servers using the old and
-                  new versions of the table.
+                  conflicts between MySQL servers using the old and new
+                  versions of the table.
                 </para>
               </listitem>
+
             </orderedlist>
-            
+
             You can find more information about the changes to
-            <literal>ndb_apply_status</literal> in 
+            <literal>ndb_apply_status</literal> in
             <xref linkend="mysql-cluster-replication-schema"/>.
           </para>
         </listitem>

@@ -13451,7 +13453,7 @@
             message displayed upon completion of a backup. (See
             <xref linkend="mysql-cluster-backup-using-management-client"/>.)
           </para>
-          
+
           <para>
             <option>-e</option> adds (or restores) epoch information to
             the cluster replication status table. This is useful for

@@ -13460,7 +13462,7 @@
             <literal>mysql.ndb_apply_status</literal> having
             <literal>0</literal> in the <literal>id</literal> column is
             updated if it already exists; such a row is inserted if it
-            does not already exist. (See 
+            does not already exist. (See
             <xref linkend="mysql-cluster-replication-backups"/>.)
           </para>
 

@@ -13583,7 +13585,7 @@
                   <entry><option>-f</option></entry>
                   <entry>Do not ignore system table during restore &mdash;
                     <emphasis>EXPERIMENTAL; not for production
-                      use</emphasis></entry>
+                    use</emphasis></entry>
                   <entry><literal>FALSE</literal></entry>
                 </row>
                 <row>

@@ -17229,7 +17231,7 @@
           <para>
             <emphasis role="bold">Circular replication</emphasis>:
           </para>
-          
+
           <para>
             Prior to MySQL 5.1.18, circular replication was not
             supported with MySQL Cluster replication, due to the fact

@@ -17238,7 +17240,7 @@
             used as master and not with the server ID of the originating
             server.
           </para>
-          
+
           <para>
             Beginning with MySQL 5.1.18, this limitation is lifted, as
             discussed in the next few paragraphs, in which we consider

@@ -17248,19 +17250,34 @@
             master for Cluster 3, and Cluster 3 acts as the master for
             Cluster 1. Each cluster has two SQL nodes, with SQL nodes A
             and B belonging to Cluster 1, SQL nodes C and D belonging to
-            Cluster 2, and SQL nodes E and F belonging to Cluster 3. 
+            Cluster 2, and SQL nodes E and F belonging to Cluster 3.
           </para>
-          
+
           <para>
             Circular replication using these clusters is supported as
-            long as: 
-            <itemizedlist><listitem><para>
-            the SQL nodes on all masters and slaves are the
-            same</para></listitem><listitem><para>All SQL nodes acting
-              as replication masters and slaves are started using the
-              <option>--log-slave-updates</option> option</para></listitem></itemizedlist>
-            This type of circular replication setup is shown in the following diagram:
-            
+            long as:
+
+            <itemizedlist>
+
+              <listitem>
+                <para>
+                  the SQL nodes on all masters and slaves are the same
+                </para>
+              </listitem>
+
+              <listitem>
+                <para>
+                  All SQL nodes acting as replication masters and slaves
+                  are started using the
+                  <option>--log-slave-updates</option> option
+                </para>
+              </listitem>
+
+            </itemizedlist>
+
+            This type of circular replication setup is shown in the
+            following diagram:
+
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/cluster-circular-replication-1.png" format="PNG"/>

@@ -17270,41 +17287,42 @@
                 which all master SQL nodes are also slaves.</phrase>
               </textobject>
             </mediaobject>
-            
+
             In this scenario, SQL node A in Cluster 1 replicates to SQL
             node C in Cluster 2; SQL node C replicates to SQL node E in
             Cluster 3; SQL node E replicates to SQL node A. In other
             words, the replication line (indicated by the red arrows in
             the diagram) directly connects all SQL nodes used as
-            replication masters and slaves. 
+            replication masters and slaves.
           </para>
-          
+
           <para>
-            It should also be possible to set up circular replication in which
-            not all master SQL nodes are also slaves, as shown here:
-            
+            It should also be possible to set up circular replication in
+            which not all master SQL nodes are also slaves, as shown
+            here:
+
             <mediaobject>
               <imageobject>
                 <imagedata fileref="images/cluster-circular-replication-2.png" format="PNG"/>
               </imageobject>
               <textobject>
                 <phrase lang="en">Cluster circular replication scheme in
-                  which all master SQL nodes are not also necessarily slaves.</phrase>
+                which all master SQL nodes are not also necessarily
+                slaves.</phrase>
               </textobject>
-              
             </mediaobject>
-            
+
             In this case, different SQL nodes in each cluster are used
             as replication masters and slaves. However, you must
             <emphasis>not</emphasis> start any of the SQL nodes using
-            <option>--log-slave-updates</option> (see the 
+            <option>--log-slave-updates</option> (see the
             <link linkend="optvar_log-slave-updates">description of this
             option</link> for more information). This type of circular
             replication scheme for MySQL Cluster, in which the line of
             replication (again indicated by the red arrows in the
             diagram) is discontinuous, should be possible, but it should
-            be noted that it has not yet been thoroughly tested and
-            must therefore still be considered experimental.
+            be noted that it has not yet been thoroughly tested and must
+            therefore still be considered experimental.
           </para>
         </listitem>
 

@@ -17374,25 +17392,25 @@
         <primary><literal>cluster_replication</literal> database (obsolete)</primary>
 <!--        <see>MySQL Cluster replication</see> -->
       </indexterm>
-      
+
       <indexterm>
         <primary><literal>binlog_index</literal> table (obsolete)</primary>
-        <!--        <seealso>MySQL Cluster replication</seealso>  -->
+<!--        <seealso>MySQL Cluster replication</seealso>  -->
       </indexterm>
-      
+
       <indexterm>
         <primary><literal>ndb_binlog_index</literal> table (MySQL Cluster replication)</primary>
-        <!--        <seealso>MySQL Cluster replication</seealso>  -->
+<!--        <seealso>MySQL Cluster replication</seealso>  -->
       </indexterm>
-      
+
       <indexterm>
         <primary><literal>cluster.binlog_index</literal> table (obsolete)</primary>
-        <!--        <see>MySQL Cluster replication</see> -->
+<!--        <see>MySQL Cluster replication</see> -->
       </indexterm>
-      
+
       <indexterm>
         <primary><literal>mysql.ndb_binlog_index</literal> table</primary>
-        <!--        <see>MySQL Cluster replication</see> -->
+<!--        <see>MySQL Cluster replication</see> -->
       </indexterm>
 
       <para>

@@ -17483,7 +17501,7 @@
         <literal>ndb_apply_status</literal> can use the <literal>NDB
         Cluster</literal> storage engine, as shown here:
       </para>
-      
+
 <programlisting>
 CREATE TABLE `ndb_apply_status` (
     `server_id`   INT(10) UNSIGNED NOT NULL,

@@ -17494,16 +17512,16 @@
     PRIMARY KEY (`server_id`) USING HASH
 ) ENGINE=NDBCLUSTER   DEFAULT CHARSET=latin1;
 </programlisting>
-      
+
       <para>
         The <literal>log_name</literal>, <literal>start_pos</literal>,
         and <literal>end_pos</literal> columns were added in MySQL
         5.1.18.
       </para>
-      
+
       <important>
         <para>
-          If you are using MySQL Cluster replication, see 
+          If you are using MySQL Cluster replication, see
           <xref linkend="mysql-cluster-upgrade-downgrade-compatibility"/>
           before upgrading to MySQL 5.1.18 or later from an earlier
           version.

@@ -18446,8 +18464,8 @@
               example is required in order that the epoch is written to
               the slave <literal>mysql.ndb_apply_status</literal>.
               Without this information, the slave will not be able to
-              synchronize properly with the master. (See 
-              <xref linkend="mysql-cluster-restore"/>.)  
+              synchronize properly with the master. (See
+              <xref linkend="mysql-cluster-restore"/>.)
             </para>
           </important>
         </listitem>

@@ -21258,48 +21276,55 @@
               <primary>MySQL Cluster limitations</primary>
               <secondary>Disk Data tables</secondary>
             </indexterm>
+
             <para>
-              <emphasis role="bold">Issues relating to Disk Data tables</emphasis>:
-            
-            <itemizedlist>
-              <listitem>
-                <para>
-                  Disk data objects are subject to the following maximums:
-                  
-                  <itemizedlist>                    
-                    <listitem>
-                      <para>
-                        Maxmimum number of tablespaces: 2^32 (4294967296)
-                      </para>
-                    </listitem>
-                    
-                    <listitem>
-                      <para>
-                        Maximum number of data files per tablespace:
-                        2^16 (65535)
-                      </para>
-                    </listitem>
-                    
-                    <listitem>
-                      <para>
-                        Maxmimum data file size: 2^47 (128GB)
-                      </para>
-                    </listitem>
-                  </itemizedlist>
-                  
-                </para>
-              </listitem>
-              
-              <listitem>
-                <para>
-                  Use of Disk Data tables is not supported when running the
-                  cluster in diskless mode. Beginning with MySQL 5.1.12, it
-                  is disallowed altogether. (Bug #20008)
-                </para>                
-              </listitem>
-            </itemizedlist>
+              <emphasis role="bold">Issues relating to Disk Data
+              tables</emphasis>:
+
+              <itemizedlist>
+
+                <listitem>
+                  <para>
+                    Disk data objects are subject to the following
+                    maximums:
+
+                    <itemizedlist>
+
+                      <listitem>
+                        <para>
+                          Maxmimum number of tablespaces: 2^32
+                          (4294967296)
+                        </para>
+                      </listitem>
+
+                      <listitem>
+                        <para>
+                          Maximum number of data files per tablespace:
+                          2^16 (65535)
+                        </para>
+                      </listitem>
+
+                      <listitem>
+                        <para>
+                          Maxmimum data file size: 2^47 (128GB)
+                        </para>
+                      </listitem>
+
+                    </itemizedlist>
+                  </para>
+                </listitem>
+
+                <listitem>
+                  <para>
+                    Use of Disk Data tables is not supported when
+                    running the cluster in diskless mode. Beginning with
+                    MySQL 5.1.12, it is disallowed altogether. (Bug
+                    #20008)
+                  </para>
+                </listitem>
+
+              </itemizedlist>
             </para>
-            
           </listitem>
 
           <listitem>


Modified: trunk/refman-5.1/news-5.1.xml
===================================================================
--- trunk/refman-5.1/news-5.1.xml	2007-04-24 02:30:24 UTC (rev 6099)
+++ trunk/refman-5.1/news-5.1.xml	2007-04-24 02:31:48 UTC (rev 6100)
Changed blocks: 1, Lines Added: 4, Lines Deleted: 5; 882 bytes

@@ -156,14 +156,13 @@
           <xref linkend="mysql-cluster-replication-schema"/>.
         </para>
       </listitem>
-      
+
       <listitem>
         <para>
-          <literal>NDB Cluster</literal> (Replication): Some
-          circular replication setups are now supported for MySQL
-          Cluster. See 
+          <literal>NDB Cluster</literal> (Replication): Some circular
+          replication setups are now supported for MySQL Cluster. See
           <xref linkend="mysql-cluster-replication-issues"/>, for
-          detailed information. (Bug #25688) 
+          detailed information. (Bug #25688)
         </para>
       </listitem>
 


Thread
svn commit - mysqldoc@docsrva: r6100 - trunk/refman-5.1jon24 Apr