List:Commits« Previous MessageNext Message »
From:jon Date:June 1 2006 8:59am
Subject:svn commit - mysqldoc@docsrva: r2245 - in trunk: refman-4.1 refman-4.1/images refman-5.0 refman-5.0/images refman-5.1 refman-5.1/images
View as plain text  
Author: jstephens
Date: 2006-06-01 10:59:30 +0200 (Thu, 01 Jun 2006)
New Revision: 2245

Log:

Fix for Docs Bug #19926 (Cluster Upgrade/Downgrade matrix usability issues)

Added new digram, updated Makefiles.



Added:
   trunk/refman-4.1/images/cluster-upgrade-downgrade-table.png
   trunk/refman-5.0/images/cluster-upgrade-downgrade-table.png
   trunk/refman-5.1/images/cluster-upgrade-downgrade-table.png
Modified:
   trunk/refman-4.1/Makefile
   trunk/refman-4.1/ndbcluster.xml
   trunk/refman-5.0/Makefile
   trunk/refman-5.0/ndbcluster.xml
   trunk/refman-5.1/Makefile
   trunk/refman-5.1/ndbcluster.xml

Modified: trunk/refman-4.1/Makefile
===================================================================
--- trunk/refman-4.1/Makefile	2006-05-31 20:28:59 UTC (rev 2244)
+++ trunk/refman-4.1/Makefile	2006-06-01 08:59:30 UTC (rev 2245)
@@ -44,7 +44,7 @@
 
 MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
 
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png imag!
 es/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-4.1.xml ../refman-common/news-4.0.xml ../refman-common/news-3.23.xml ../refman-common/news-innodb.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml 
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-4.0.xml ../refman-common/reserved-new-4.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png spatial-extensions.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png i!
 mages/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-4.1.xml ../refman-common/news-4.0.xml ../refman-common/news-3.23.xml ../refman-common/news-innodb.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-fl!
 oss-license-exception.xml 
 
 manual-prepped.xml: $(MANUAL_SRCS)
 manual-manprepped.xml: $(MANUAL_SRCS)

Added: trunk/refman-4.1/images/cluster-upgrade-downgrade-table.png
===================================================================
(Binary files differ)


Property changes on: trunk/refman-4.1/images/cluster-upgrade-downgrade-table.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/refman-4.1/ndbcluster.xml
===================================================================
--- trunk/refman-4.1/ndbcluster.xml	2006-05-31 20:28:59 UTC (rev 2244)
+++ trunk/refman-4.1/ndbcluster.xml	2006-06-01 08:59:30 UTC (rev 2245)
@@ -6945,220 +6945,16 @@
         compatibility between different versions of the MySQL Server.
       </para>
 
-      <table>
-        <caption> Cluster Upgrade/Downgrade Compatibility &mdash; by
-        MySQL Server version </caption>
-        <tbody>
-          <tr>
-            <td colspan="2">
-              <para>
-                <emphasis role="bold">MySQL 4.1</emphasis>
-              </para>
-            </td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td colspan="2">
-              <para>
-                <emphasis role="bold">MySQL 5.0</emphasis>
-              </para>
-            </td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td colspan="2">
-              <para>
-                <emphasis role="bold">MySQL 5.1</emphasis>
-              </para>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.21</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.20</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.19</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.18</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.17</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.16</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.15</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.14</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.19</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.13</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.18</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.12</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.17</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.11</td>
-            <td>&uArr; (see Notes)</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.16</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.10</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.15</td>
-            <td>&uArr; (see Notes)</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.9</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.14</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.8</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.10</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.13</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.7</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.9</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.12</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.6</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.7</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.11</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.5</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.6</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.10</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.4</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.5</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.9</td>
-            <td>&uArr; / &dArr; (see Notes)</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.3</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.4</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.8</td>
-            <td>&uArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.2</td>
-            <td>&uArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.3</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td colspan="1">
-              <para>
-                <emphasis>KEY</emphasis>:
-              </para>
-            </td>
-            <td colspan="7">
-              <itemizedlist>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/cluster-upgrade-downgrade-table.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase lang="en">MySQL Cluster upgrade/downgrade
+            compatibility, by MySQL server version</phrase>
+        </textobject>
+      </mediaobject>
 
-                <listitem>
-                  <para>
-                    &vArr;: Upwardly and downwardly compatible
-                  </para>
-                </listitem>
-
-                <listitem>
-                  <para>
-                    &uArr;: Upwardly compatible only
-                  </para>
-                </listitem>
-
-                <listitem>
-                  <para>
-                    &dArr;: Downwardly compatible only
-                  </para>
-                </listitem>
-
-              </itemizedlist>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-
       <para>
         <emphasis role="bold">Notes</emphasis>:
       </para>

Modified: trunk/refman-5.0/Makefile
===================================================================
--- trunk/refman-5.0/Makefile	2006-05-31 20:28:59 UTC (rev 2244)
+++ trunk/refman-5.0/Makefile	2006-06-01 08:59:30 UTC (rev 2245)
@@ -44,7 +44,7 @@
 
 MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
 
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.0.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon!
 .png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml 
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.0.xml charset.xml data-types.xml functions.xml sql-syntax.xml storage-engines.xml innodb.xml images/blackhole-1.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png spatial-extensions.xml stored-procedures.xml triggers.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml !
 images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.0.xml ../refman-common/news-cluster.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman-common/regexp.xml limits.xml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml 
 
 manual-prepped.xml: $(MANUAL_SRCS)
 manual-manprepped.xml: $(MANUAL_SRCS)

Added: trunk/refman-5.0/images/cluster-upgrade-downgrade-table.png
===================================================================
(Binary files differ)


Property changes on: trunk/refman-5.0/images/cluster-upgrade-downgrade-table.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/refman-5.0/ndbcluster.xml
===================================================================
--- trunk/refman-5.0/ndbcluster.xml	2006-05-31 20:28:59 UTC (rev 2244)
+++ trunk/refman-5.0/ndbcluster.xml	2006-06-01 08:59:30 UTC (rev 2245)
@@ -6939,221 +6939,17 @@
         The following table shows Cluster upgrade and downgrade
         compatibility between different versions of the MySQL Server.
       </para>
+      
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/cluster-upgrade-downgrade-table.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase lang="en">MySQL Cluster upgrade/downgrade
+            compatibility, by MySQL server version</phrase>
+        </textobject>
+      </mediaobject>
 
-      <table>
-        <caption> Cluster Upgrade/Downgrade Compatibility &mdash; by
-        MySQL Server version </caption>
-        <tbody>
-          <tr>
-            <td colspan="2">
-              <para>
-                <emphasis role="bold">MySQL 4.1</emphasis>
-              </para>
-            </td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td colspan="2">
-              <para>
-                <emphasis role="bold">MySQL 5.0</emphasis>
-              </para>
-            </td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td colspan="2">
-              <para>
-                <emphasis role="bold">MySQL 5.1</emphasis>
-              </para>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.21</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.20</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.19</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.18</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.17</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.16</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.15</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.14</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.19</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.13</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.18</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.12</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.17</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.11</td>
-            <td>&uArr; (see Notes)</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.16</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.10</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.15</td>
-            <td>&uArr; (see Notes)</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.9</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.14</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.8</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.10</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.13</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.7</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.9</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.12</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.6</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.7</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.11</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.5</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.6</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.10</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.4</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.5</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.9</td>
-            <td>&uArr; / &dArr; (see Notes)</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.3</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.4</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.8</td>
-            <td>&uArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.2</td>
-            <td>&uArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.3</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td colspan="1">
-              <para>
-                <emphasis>KEY</emphasis>:
-              </para>
-            </td>
-            <td colspan="7">
-              <itemizedlist>
-
-                <listitem>
-                  <para>
-                    &vArr;: Upwardly and downwardly compatible
-                  </para>
-                </listitem>
-
-                <listitem>
-                  <para>
-                    &uArr;: Upwardly compatible only
-                  </para>
-                </listitem>
-
-                <listitem>
-                  <para>
-                    &dArr;: Downwardly compatible only
-                  </para>
-                </listitem>
-
-              </itemizedlist>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-
       <para>
         <emphasis role="bold">Notes</emphasis>:
       </para>

Modified: trunk/refman-5.1/Makefile
===================================================================
--- trunk/refman-5.1/Makefile	2006-05-31 20:28:59 UTC (rev 2244)
+++ trunk/refman-5.1/Makefile	2006-06-01 08:59:30 UTC (rev 2245)
@@ -44,7 +44,7 @@
 
 MANUAL_SRCS_EXTRA = versions.ent ../refman-common/fixedchars.ent ../refman-common/titles.en.ent
 
-MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml pluggable-storage.xml images/pluggable-storage-overview.png storage-engines.xml innodb.xml images/blackhole-1.png custom-engine.xml images/custom-engine-overview.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-replication-overview.png images/cluster-replication-binlog-injector.p!
 ng partitioning.xml spatial-extensions.xml stored-procedures.xml triggers.xml events.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.1.xml ../refman-common/news-myodbc.xml porting.xml ../refman-common/environment-variables.xml ../refman!
 -common/regexp.xml limits.xml restrictions.xml ../refman-commo!
 n/gpl-li
cense.xml ../refman-common/mysql-floss-license-exception.xml 
+MANUAL_SRCS = $(MANUAL_SRCS_EXTRA) manual.xml legalnotice.en.xml copyright.xml preface.xml introduction.xml ../refman-common/manual-conventions.en.xml ../refman-common/what-is-mysql-ab.en.xml ../refman-common/what-is.en.xml ../refman-common/maxdb.en.xml ../refman-common/information-sources.xml ../refman-common/bug-reports.xml installing.xml tutorial.xml using-mysql-programs.xml database-administration.xml replication.xml optimization.xml client-utility-programs.xml language-structure.xml reservedwords.xml ../refman-common/reserved-new-5.1.xml charset.xml data-types.xml functions.xml sql-syntax.xml pluggable-storage.xml images/pluggable-storage-overview.png storage-engines.xml innodb.xml images/blackhole-1.png custom-engine.xml images/custom-engine-overview.png ndbcluster.xml images/cluster-components-1.png images/replicas-groups-1-1.png images/replicas-groups-1-2.png images/multi-comp-1.png images/cluster-upgrade-downgrade-table.png images/cluster-replication-overview.png i!
 mages/cluster-replication-binlog-injector.png partitioning.xml spatial-extensions.xml stored-procedures.xml triggers.xml events.xml views.xml information-schema.xml precision-math.xml apis.xml connectors.xml connector-odbc.xml images/myarchitecture.png images/mydsn-icon.png images/mydsn.png images/mydsn-setup.png images/mydsn-example.png images/mydsn-test-success.png images/mydsn-test-fail.png images/mydsn-options.png images/mydsn-icon.png images/mydsn.png images/mydsn-trace.png images/myaccess.png images/myaccess-odbc.png images/mydsn-trace.png images/mydll-properties.png images/mydsn-options.png images/myflowchart.png connector-net.xml ../refman-common/news-connector-net.xml connector-j.xml ../refman-common/news-connector-j.xml connector-mxj.xml connector-php.xml extending-mysql.xml problems.xml error-handling.xml errmsgs-server.xml errmsgs-client.xml ../refman-common/credits.xml news.xml ../refman-common/news-5.1.xml ../refman-common/news-myodbc.xml porting.xml ../refman!
 -common/environment-variables.xml ../refman-common/regexp.xml !
 limits.x
ml restrictions.xml ../refman-common/gpl-license.xml ../refman-common/mysql-floss-license-exception.xml 
 
 manual-prepped.xml: $(MANUAL_SRCS)
 manual-manprepped.xml: $(MANUAL_SRCS)

Added: trunk/refman-5.1/images/cluster-upgrade-downgrade-table.png
===================================================================
(Binary files differ)


Property changes on: trunk/refman-5.1/images/cluster-upgrade-downgrade-table.png
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Modified: trunk/refman-5.1/ndbcluster.xml
===================================================================
--- trunk/refman-5.1/ndbcluster.xml	2006-05-31 20:28:59 UTC (rev 2244)
+++ trunk/refman-5.1/ndbcluster.xml	2006-06-01 08:59:30 UTC (rev 2245)
@@ -6945,220 +6945,16 @@
         compatibility between different versions of the MySQL Server.
       </para>
 
-      <table>
-        <caption> Cluster Upgrade/Downgrade Compatibility &mdash; by
-        MySQL Server version </caption>
-        <tbody>
-          <tr>
-            <td colspan="2">
-              <para>
-                <emphasis role="bold">MySQL 4.1</emphasis>
-              </para>
-            </td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td colspan="2">
-              <para>
-                <emphasis role="bold">MySQL 5.0</emphasis>
-              </para>
-            </td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td colspan="2">
-              <para>
-                <emphasis role="bold">MySQL 5.1</emphasis>
-              </para>
-            </td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.21</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.20</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.19</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.18</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.17</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.16</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.15</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.14</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.19</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.13</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.18</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.12</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.17</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.11</td>
-            <td>&uArr; (see Notes)</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.16</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.10</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.15</td>
-            <td>&uArr; (see Notes)</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.9</td>
-            <td>&vArr;</td>
-            <td colspan="3">&nbsp;&nbsp;&nbsp;</td>
-          </tr>
-          <tr>
-            <td>4.1.14</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.8</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.10</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.13</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.7</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.9</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.12</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.6</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.7</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.11</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.5</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.6</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.10</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.4</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.5</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.9</td>
-            <td>&uArr; / &dArr; (see Notes)</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.3</td>
-            <td>&vArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.4</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td>4.1.8</td>
-            <td>&uArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.0.2</td>
-            <td>&uArr;</td>
-            <td>&nbsp;&nbsp;&nbsp;</td>
-            <td>5.1.3</td>
-            <td>&vArr;</td>
-          </tr>
-          <tr>
-            <td colspan="1">
-              <para>
-                <emphasis>KEY</emphasis>:
-              </para>
-            </td>
-            <td colspan="7">
-              <itemizedlist>
+      <mediaobject>
+        <imageobject>
+          <imagedata fileref="images/cluster-upgrade-downgrade-table.png" format="PNG"/>
+        </imageobject>
+        <textobject>
+          <phrase lang="en">MySQL Cluster upgrade/downgrade
+            compatibility, by MySQL server version</phrase>
+        </textobject>
+      </mediaobject>
 
-                <listitem>
-                  <para>
-                    &vArr;: Upwardly and downwardly compatible
-                  </para>
-                </listitem>
-
-                <listitem>
-                  <para>
-                    &uArr;: Upwardly compatible only
-                  </para>
-                </listitem>
-
-                <listitem>
-                  <para>
-                    &dArr;: Downwardly compatible only
-                  </para>
-                </listitem>
-
-              </itemizedlist>
-            </td>
-          </tr>
-        </tbody>
-      </table>
-
       <para>
         <emphasis role="bold">Notes</emphasis>:
       </para>
@@ -11241,7 +11037,7 @@
 
           <para>
             Because of this misidentification, replicating between MySQL
-            servers <emphasis role="bold">A&rArr;B&rArr;A</emphasis>,
+            servers <emphasis role="bold">A&rarr;B&rarr;A</emphasis>,
             where <emphasis>B</emphasis> is any MySQL server connected
             to a cluster <emphasis>A</emphasis>, causes the cluster
             table changes (log entries) of <emphasis>A</emphasis> to

Thread
svn commit - mysqldoc@docsrva: r2245 - in trunk: refman-4.1 refman-4.1/images refman-5.0 refman-5.0/images refman-5.1 refman-5.1/imagesjon1 Jun