List:Commits« Previous MessageNext Message »
From:jon.stephens Date:June 23 2011 11:18am
Subject:svn commit - mysqldoc@oter02: r26596 - in trunk: refman-5.1 refman-common/images/published refman-common/images/source/cluster-upgrade-downgrade refma...
View as plain text  
Author: js221926
Date: 2011-06-23 13:18:59 +0200 (Thu, 23 Jun 2011)
New Revision: 26596

Log:

Updated/corrected NDB 6.x/7.x upgrade/downgrade charts (Thanks, MMontgomery and BOcklin!)

Substituted better curved arrow graphic for 7.x table



Modified:
   trunk/refman-5.1/mysql-cluster-installation.xml
   trunk/refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png
   trunk/refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png
   trunk/refman-common/images/source/cluster-upgrade-downgrade/images/arrow-curve-up.png
   trunk/refman-common/images/source/cluster-upgrade-downgrade/upgrade-downgrade-compat-table-6.x.html
   trunk/refman-common/images/source/cluster-upgrade-downgrade/upgrade-downgrade-compat-table-7.x.html


Modified: trunk/refman-5.1/mysql-cluster-installation.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-installation.xml	2011-06-23 08:49:16 UTC (rev 26595)
+++ trunk/refman-5.1/mysql-cluster-installation.xml	2011-06-23 11:18:59 UTC (rev 26596)
Changed blocks: 17, Lines Added: 24, Lines Deleted: 24; 6564 bytes

@@ -1444,7 +1444,7 @@
 # Options affecting ndbd processes on all data nodes:
 NoOfReplicas=2                      # Number of replicas
 DataDir=C:/mysql/bin/cluster-data   # Directory for each data node's data files
-                                    # Forward slashes used in directory path, 
+                                    # Forward slashes used in directory path,
                                     # rather than backslashes. This is correct;
                                     # see <emphasis role="bold">Important</emphasis> note in text
 DataMemory=80M    # Memory allocated to data storage

@@ -1746,7 +1746,7 @@
 <programlisting>
 C:\mysql\bin&gt; <userinput>ndb_mgm</userinput>
 -- NDB Cluster -- Management Client --
-ndb_mgm&gt;                                   
+ndb_mgm&gt;
 </programlisting>
 
           <para>

@@ -1761,7 +1761,7 @@
           </para>
 
 <programlisting>
-ndb_mgm&gt; <userinput>ALL STATUS</userinput> 
+ndb_mgm&gt; <userinput>ALL STATUS</userinput>
 Connected to Management Server at: localhost:1186
 Node 2: starting (Last completed phase 3) (mysql-&mysql-cluster-current-7.1;)
 Node 3: starting (Last completed phase 3) (mysql-&mysql-cluster-current-7.1;)

@@ -1916,7 +1916,7 @@
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\ndb_mgmd.exe --install</userinput>
 Installing service 'MySQL Cluster Management Server' as '"C:\mysql\bin\ndbd.exe" "--service=ndb_mgmd"'
-Service successfully installed. 
+Service successfully installed.
 </programlisting>
 
       <important>

@@ -1952,7 +1952,7 @@
 
 C:\&gt; <userinput>NET STOP ndb_mgmd</userinput>
 The MySQL Cluster Management Server service is stopping..
-The MySQL Cluster Management Server service was stopped successfully. 
+The MySQL Cluster Management Server service was stopped successfully.
 </programlisting>
 
       <para>

@@ -1963,11 +1963,11 @@
 <programlisting>
 C:\&gt; <userinput>NET START 'MySQL Cluster Management Server'</userinput>
 The MySQL Cluster Management Server service is starting.
-The MySQL Cluster Management Server service was started successfully. 
+The MySQL Cluster Management Server service was started successfully.
 
 C:\&gt; <userinput>NET STOP  'MySQL Cluster Management Server'</userinput>
 The MySQL Cluster Management Server service is stopping..
-The MySQL Cluster Management Server service was stopped successfully. 
+The MySQL Cluster Management Server service was stopped successfully.
 </programlisting>
 
       <para>

@@ -1983,7 +1983,7 @@
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\ndb_mgmd.exe --install=mgmd1</userinput>
 Installing service 'MySQL Cluster Management Server' as '"C:\mysql\bin\ndb_mgmd.exe" "--service=mgmd1"'
-Service successfully installed. 
+Service successfully installed.
 </programlisting>
 
       <para>

@@ -1998,7 +1998,7 @@
 
 C:\&gt; <userinput>NET STOP mgmd1</userinput>
 The MySQL Cluster Management Server service is stopping..
-The MySQL Cluster Management Server service was stopped successfully. 
+The MySQL Cluster Management Server service was stopped successfully.
 </programlisting>
 
       <para>

@@ -2010,7 +2010,7 @@
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\ndb_mgmd.exe --remove</userinput>
 Removing service 'MySQL Cluster Management Server'
-Service successfully removed. 
+Service successfully removed.
 </programlisting>
 
       <para>

@@ -2023,7 +2023,7 @@
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\ndb_mgmd.exe --remove=mgmd1</userinput>
 Removing service 'mgmd1'
-Service successfully removed. 
+Service successfully removed.
 </programlisting>
 
       <para>

@@ -2037,7 +2037,7 @@
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\ndbd.exe --install</userinput>
 Installing service 'MySQL Cluster Data Node Daemon' as '"C:\mysql\bin\ndbd.exe" "--service=ndbd"'
-Service successfully installed. 
+Service successfully installed.
 </programlisting>
 
       <para>

@@ -2074,7 +2074,7 @@
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\ndbd.exe --remove</userinput>
 Removing service 'MySQL Cluster Data Node Daemon'
-Service successfully removed. 
+Service successfully removed.
 </programlisting>
 
       <para>

@@ -2110,7 +2110,7 @@
 <programlisting>
 C:\&gt; <userinput>C:\mysql\bin\ndbd.exe --remove=dnode1</userinput>
 Removing service 'dnode1'
-Service successfully removed. 
+Service successfully removed.
 </programlisting>
 
       <para>

@@ -2129,15 +2129,15 @@
     <section id="mysql-cluster-install-windows-issues">
 
       <title>MySQL Cluster Issues Specific to Windows</title>
-      
-      
+
+
       <remark role="note">
-      [js] This section (when completed) might be better placed in 
-      the Known Issues section of the Cluster chapter. 
+      [js] This section (when completed) might be better placed in
+      the Known Issues section of the Cluster chapter.
       </remark>
-      
+
       <para>
-      
+
       </para>
 
     </section>

@@ -2299,8 +2299,8 @@
 # TCP/IP options:
 portnumber=2202   # This the default; however, you can use any
                   # port that is free for all the hosts in the cluster
-                  # Note: It is recommended that you do not specify the port 
-                  # number at all and simply allow the default value to be used 
+                  # Note: It is recommended that you do not specify the port
+                  # number at all and simply allow the default value to be used
                   # instead
 
 [ndb_mgmd]

@@ -3095,7 +3095,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata contentwidth="400" contentdepth="950" fileref="../refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png" format="PNG"/>
+          <imagedata contentwidth="385" contentdepth="1045" fileref="../refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase lang="en">MySQL Cluster upgrade/downgrade

@@ -3367,7 +3367,7 @@
 
       <mediaobject>
         <imageobject>
-          <imagedata contentwidth="550" contentdepth="1275" fileref="../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png" format="PNG"/>
+          <imagedata contentwidth="475" contentdepth="1350" fileref="../refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png" format="PNG"/>
         </imageobject>
         <textobject>
           <phrase lang="en">MySQL Cluster upgrade/downgrade


Modified: trunk/refman-common/images/published/mysql-cluster-upgrade-downgrade-6-x.png
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 174 bytes


Modified: trunk/refman-common/images/published/mysql-cluster-upgrade-downgrade-7-x.png
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 174 bytes


Modified: trunk/refman-common/images/source/cluster-upgrade-downgrade/images/arrow-curve-up.png
===================================================================


Changed blocks: 0, Lines Added: 0, Lines Deleted: 0; 183 bytes


Modified: trunk/refman-common/images/source/cluster-upgrade-downgrade/upgrade-downgrade-compat-table-6.x.html
===================================================================
--- trunk/refman-common/images/source/cluster-upgrade-downgrade/upgrade-downgrade-compat-table-6.x.html	2011-06-23 08:49:16 UTC (rev 26595)
+++ trunk/refman-common/images/source/cluster-upgrade-downgrade/upgrade-downgrade-compat-table-6.x.html	2011-06-23 11:18:59 UTC (rev 26596)
Changed blocks: 2, Lines Added: 24, Lines Deleted: 9; 2919 bytes

@@ -29,13 +29,13 @@
           <th height="20" colspan="3" class="main">
              NDB 6.1&#8224; 
           </th>
-          <td width="5" rowspan="47" class="divider">&nbsp;
+          <td width="5" rowspan="52" class="divider">&nbsp;
               
           </td>
           <th colspan="3" class="main">
              NDB 6.2 
           </th>
-          <td width="5" rowspan="47" class="divider">&nbsp;
+          <td width="5" rowspan="52" class="divider">&nbsp;
               
           </td>
           <th colspan="3">

@@ -43,23 +43,38 @@
           </th>
         </tr>
         <tr>
-          <td colspan="3" rowspan="22" class="unsupported">&nbsp;
+          <td colspan="3" rowspan="27" class="unsupported">&nbsp;
               
           </td>
-          <td colspan="3" rowspan="26" class="unsupported">&nbsp;
+          <td colspan="3" rowspan="31" class="unsupported">&nbsp;
               
           </td>
-          <td width="30" rowspan="38">
-            <img src="images/up.png" alt="^" width="35" height="20" hspace="0" vspace="0" border="0" align="top"/><img src="images/middle.png" alt="|" width="35" height="720" hspace="0" vspace="0" border="0" align="top"/><img src="images/down.png" alt="v" width="35" height="20" hspace="0" vspace="0" border="0" align="top"/>
+          <td width="30" rowspan="43">
+            <img src="images/up.png" alt="^" width="35" height="20" hspace="0" vspace="0" border="0" align="top"/><img src="images/middle.png" alt="|" width="35" height="820" hspace="0" vspace="0" border="0" align="top"/><img src="images/down.png" alt="v" width="35" height="20" hspace="0" vspace="0" border="0" align="top"/>
           </td>
-          <td width="35" height="20">
-             &nbsp;6.3.40&nbsp; 
+          <td width="35" height="10">
+             &nbsp;6.3.45&nbsp; 
           </td>
-          <td width="35" rowspan="37" class="unsupported">&nbsp;
+          <td width="35" rowspan="42" class="unsupported">&nbsp;
               
           </td>
         </tr>
         <tr>
+          <td height="10">&nbsp;6.3.44&nbsp;</td>
+        </tr>
+        <tr>
+          <td height="20">&nbsp;6.3.43&nbsp;</td>
+        </tr>
+        <tr>
+          <td height="20">&nbsp;6.3.42&nbsp;</td>
+        </tr>
+        <tr>
+          <td height="20">&nbsp;6.3.41&nbsp;</td>
+        </tr>
+        <tr>
+          <td height="20">&nbsp;6.3.40&nbsp;</td>
+        </tr>
+        <tr>
           <td height="20">&nbsp;6.3.39&nbsp;</td>
         </tr>
         <tr>


Modified: trunk/refman-common/images/source/cluster-upgrade-downgrade/upgrade-downgrade-compat-table-7.x.html
===================================================================
--- trunk/refman-common/images/source/cluster-upgrade-downgrade/upgrade-downgrade-compat-table-7.x.html	2011-06-23 08:49:16 UTC (rev 26595)
+++ trunk/refman-common/images/source/cluster-upgrade-downgrade/upgrade-downgrade-compat-table-7.x.html	2011-06-23 11:18:59 UTC (rev 26596)
Changed blocks: 6, Lines Added: 29, Lines Deleted: 9; 4944 bytes

@@ -33,7 +33,7 @@
                   <th height="20" colspan="3">
                      NDB 7.0 
                   </th>
-                  <td width="5" rowspan="35" class="divider">&nbsp;
+                  <td width="5" rowspan="40" class="divider">&nbsp;
                       
                   </td>
                   <th colspan="3">

@@ -41,13 +41,13 @@
                   </th>
                 </tr>
                 <tr>
-                  <td width="35" rowspan="21">
-                    <img src="images/up.png" alt="^" width="35" height="20" hspace="0" vspace="0" border="0" align="top"/><img src="images/middle.png" alt="|" width="35" height="400" hspace="0" vspace="0" border="0" align="bottom"/>
+                  <td width="35" rowspan="26">
+                    <img src="images/up.png" alt="^" width="35" height="20" hspace="0" vspace="0" border="0" align="top"/><img src="images/middle.png" alt="|" width="35" height="500" hspace="0" vspace="0" border="0" align="bottom"/>
                   </td>
-                  <td height="20" align="left">
-                     &nbsp;7.0.21&nbsp; 
+                  <td height="10" align="left">
+                     &nbsp;7.0.26&nbsp; 
                   </td>
-                  <td width="35" rowspan="17" class="unsupported">&nbsp;
+                  <td width="35" rowspan="22" class="unsupported">&nbsp;
                           
                 </td>
                   <td colspan="3" rowspan="22" class="unsupported">&nbsp;

@@ -55,6 +55,21 @@
                 </td>
                 </tr>
                 <tr>
+                  <td height="10" align="left">&nbsp;7.0.25&nbsp;</td>
+                </tr>
+                <tr>
+                  <td height="20" align="left">&nbsp;7.0.24&nbsp;</td>
+                </tr>
+                <tr>
+                  <td height="20" align="left">&nbsp;7.0.23&nbsp;</td>
+                </tr>
+                <tr>
+                  <td height="20" align="left">&nbsp;7.0.22&nbsp;</td>
+                </tr>
+                <tr>
+                  <td height="20" align="left">&nbsp;7.0.21&nbsp;</td>
+                </tr>
+                <tr>
                   <td height="20" align="left">
                      &nbsp;7.0.20a&nbsp; 
                   </td>

@@ -141,21 +156,28 @@
                   <td width="35" height="100" rowspan="5" class="main">
                     <img src="images/arrow-curve-up.png" width="35" height="100" hspace="0" vspace="0" align="top" />
                   </td>
+                <td rowspan="14" class="main">
+                  <img src="images/up.png" width="35" height="20" /><img src="images/middle.png" width="35" height="240" /><img src="images/down.png" width="35" height="20" /> </td>
+                <td class="main">&nbsp;7.1.15&nbsp;</td>
+                <td width="20" rowspan="17" class="unsupported">&nbsp;                  </td>
                 </tr>
                 <tr>
                   <td align="left" class="unsupported">
                      &nbsp;7.0.11a*&nbsp; 
                   </td>
+                <td class="main">&nbsp;7.1.14&nbsp;</td>
                 </tr>
                 <tr>
                   <td align="left" class="unsupported">
                      &nbsp;7.0.11*&nbsp; 
                   </td>
+                <td class="main">&nbsp;7.1.13&nbsp;</td>
                 </tr>
                 <tr>
                   <td height="20" align="left" class="main">
                      &nbsp;7.0.10&nbsp; 
                   </td>
+                <td class="main">&nbsp;7.1.12&nbsp;</td>
                 </tr>
                 <tr>
                   <td width="35" rowspan="8" class="main">

@@ -164,6 +186,7 @@
                   <td align="left" class="main">
                      &nbsp;7.0.9b&nbsp; 
                   </td>
+                <td class="main">&nbsp;7.1.11&nbsp;</td>
                 </tr>
                 <tr>
                   <td align="left" class="main">

@@ -172,10 +195,7 @@
                   <td width="35" rowspan="12" class="unsupported">&nbsp;
                       
                   </td>
-                <td rowspan="9" class="main">
-                  <img src="images/up.png" width="35" height="20" /><img src="images/middle.png" width="35" height="160" />                  </td>
                 <td class="main">&nbsp;7.1.10&nbsp;</td>
-                <td width="20" rowspan="12" class="unsupported">&nbsp;                  </td>
                 </tr>
                 <tr>
                   <td align="left" class="main">


Thread
svn commit - mysqldoc@oter02: r26596 - in trunk: refman-5.1 refman-common/images/published refman-common/images/source/cluster-upgrade-downgrade refma...jon.stephens23 Jun