Author: jstephens
Date: 2009-10-02 10:35:07 +0200 (Fri, 02 Oct 2009)
New Revision: 16921
Log:
5.1.39 merge to NDB-{6.3,7.0,7.1}
Updated entity and version defs, renamed-nodes.txt, etc.
Modified:
trunk/common/phrases.ent
trunk/dynamic-docs/changelog/mysqld-1.xml
trunk/dynamic-docs/changelog/mysqld-versions.xml
trunk/refman-5.1/mysql-cluster-news-core.xml
trunk/refman-5.1/renamed-nodes.txt
Modified: trunk/common/phrases.ent
===================================================================
--- trunk/common/phrases.ent 2009-10-02 01:59:35 UTC (rev 16920)
+++ trunk/common/phrases.ent 2009-10-02 08:35:07 UTC (rev 16921)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 3; 1880 bytes
@@ -22,9 +22,9 @@
<!ENTITY mysql-cluster-current-6.1 "5.1.15-ndb-&ndb-engine-current-6.1;"><!-- Latest MySQL NDB 6.1 release - update with new releases -->
<!ENTITY mysql-cluster-current-6.2 "5.1.37-ndb-&ndb-engine-current-6.2;"><!-- Latest MySQL NDB 6.2 release - update with new releases -->
-<!ENTITY mysql-cluster-current-6.3 "5.1.37-ndb-&ndb-engine-current-6.3;"><!-- Latest MySQL NDB 6.3 release - update with new releases -->
-<!ENTITY mysql-cluster-current-7.0 "5.1.37-ndb-&ndb-engine-current-7.0;"><!-- Latest MySQL NDB 7.0 release - update with new releases -->
-<!ENTITY mysql-cluster-current-7.1 "5.1.37-ndb-&ndb-engine-current-7.1;"><!-- Latest MySQL NDB 7.1 release - update with new releases -->
+<!ENTITY mysql-cluster-current-6.3 "5.1.39-ndb-&ndb-engine-current-6.3;"><!-- Latest MySQL NDB 6.3 release - update with new releases -->
+<!ENTITY mysql-cluster-current-7.0 "5.1.39-ndb-&ndb-engine-current-7.0;"><!-- Latest MySQL NDB 7.0 release - update with new releases -->
+<!ENTITY mysql-cluster-current-7.1 "5.1.39-ndb-&ndb-engine-current-7.1;"><!-- Latest MySQL NDB 7.1 release - update with new releases -->
<!ENTITY mysql-cluster-warning-section '<formalpara role="mysql-cluster-warning"><title>MySQL Cluster</title><para>The information in this section applies to users of MySQL Cluster only. For more information, see <xref linkend="mysql-cluster"/>.</para></formalpara>'>
<!ENTITY mysql-cluster-warning-begin '<formalpara role="mysql-cluster-warning"><title>MySQL Cluster</title><para>The following information applies to users of MySQL Cluster only. For more information, see <xref linkend="mysql-cluster"/>.</para></formalpara>'>
Modified: trunk/dynamic-docs/changelog/mysqld-1.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-1.xml 2009-10-02 01:59:35 UTC (rev 16920)
+++ trunk/dynamic-docs/changelog/mysqld-1.xml 2009-10-02 08:35:07 UTC (rev 16921)
Changed blocks: 4, Lines Added: 5, Lines Deleted: 5; 1026 bytes
@@ -98,8 +98,8 @@
</bugs>
<versions>
- <version ver="5.1.37-ndb-6.3.28"/>
- <version ver="5.1.37-ndb-7.0.9"/>
+ <version ver="5.1.39-ndb-6.3.28"/>
+ <version ver="5.1.39-ndb-7.0.9"/>
</versions>
<message>
@@ -5478,7 +5478,7 @@
<versions>
<version ver="5.1.35-ndb-7.0.7"/>
- <version ver="5.1.37-ndb-7.1.0"/>
+ <version ver="5.1.39-ndb-7.1.0"/>
</versions>
<message>
@@ -5500,7 +5500,7 @@
</tags>
<versions>
- <version ver="5.1.37-ndb-7.1.0"/>
+ <version ver="5.1.39-ndb-7.1.0"/>
</versions>
<message>
@@ -5960,7 +5960,7 @@
</bugs>
<versions>
- <version ver="5.1.34-ndb-7.1.0"/>
+ <version ver="5.1.39-ndb-7.1.0"/>
</versions>
<message>
Modified: trunk/dynamic-docs/changelog/mysqld-versions.xml
===================================================================
--- trunk/dynamic-docs/changelog/mysqld-versions.xml 2009-10-02 01:59:35 UTC (rev 16920)
+++ trunk/dynamic-docs/changelog/mysqld-versions.xml 2009-10-02 08:35:07 UTC (rev 16921)
Changed blocks: 1, Lines Added: 6, Lines Deleted: 6; 2027 bytes
@@ -40,18 +40,18 @@
<versionentry ver="5.2.1" reldate="Not released" rellevel="Alpha"/>
<versionentry ver="5.1.40" reldate="Not yet released"/>
<versionentry ver="5.1.39" reldate="04 September 2009"/>
+ <versionentry ver="5.1.39" subver="ndb-7.1.0" reldate="Not yet released"/>
+ <versionentry ver="5.1.39" subver="ndb-7.0.9" reldate="Not yet released"/>
+ <versionentry ver="5.1.39" subver="ndb-6.3.28" reldate="Not yet released"/>
<versionentry ver="5.1.38" reldate="01 September 2009"/>
<versionentry ver="5.1.37" reldate="13 July 2009"/>
+ <versionentry ver="5.1.37" subver="ndb-7.0.8" reldate="30 September 2009"/>
+ <versionentry ver="5.1.37" subver="ndb-6.3.27" reldate="30 September 2009"/>
+ <versionentry ver="5.1.37" subver="ndb-6.2.19" reldate="Not yet released"/>
<versionentry ver="5.1.36" reldate="16 June 2009"/>
<versionentry ver="5.1.35" reldate="13 May 2009"/>
- <versionentry ver="5.1.37" subver="ndb-7.1.0" reldate="Not yet released"/>
- <versionentry ver="5.1.37" subver="ndb-7.0.9" reldate="Not yet released"/>
- <versionentry ver="5.1.37" subver="ndb-6.3.28" reldate="Not yet released"/>
- <versionentry ver="5.1.37" subver="ndb-7.0.8" reldate="30 September 2009"/>
- <versionentry ver="5.1.37" subver="ndb-6.3.27" reldate="30 September 2009"/>
<versionentry ver="5.1.35" subver="ndb-7.0.7" reldate="26 August 2009"/>
<versionentry ver="5.1.35" subver="ndb-6.3.26" reldate="26 August 2009"/>
- <versionentry ver="5.1.37" subver="ndb-6.2.19" reldate="Not yet released"/>
<versionentry ver="5.1.34sp1" versiontag="es" package="qsp" reldate="25 June 2009"/>
<versionentry ver="5.1.34" reldate="02 April 2009"/>
<versionentry ver="5.1.34" subver="ndb-7.0.6" reldate="26 May 2009"/>
Modified: trunk/refman-5.1/mysql-cluster-news-core.xml
===================================================================
--- trunk/refman-5.1/mysql-cluster-news-core.xml 2009-10-02 01:59:35 UTC (rev 16920)
+++ trunk/refman-5.1/mysql-cluster-news-core.xml 2009-10-02 08:35:07 UTC (rev 16921)
Changed blocks: 11, Lines Added: 17, Lines Deleted: 17; 4795 bytes
@@ -128,9 +128,9 @@
see <xref linkend="mysql-cluster-changes-5-1-ndb-7-1"/>.
</para>
- <section id="mysql-cluster-news-5-1-37-ndb-7-1-0">
+ <section id="mysql-cluster-news-5-1-39-ndb-7-1-0">
- <title condition="dynamic:changelog:vertitle" role="5.1.37-ndb-7.1.0:mysqld:all"/>
+ <title condition="dynamic:changelog:vertitle" role="5.1.39-ndb-7.1.0:mysqld:all"/>
<para role="release-level">
This development release incorporates new features in the
@@ -167,8 +167,8 @@
This release also incorporates all bugfixes and changes made
in previous MySQL Cluster NDB 6.1, 6.2, 6.3, and 7.0 releases,
as well as all bugfixes and feature changes which were added
- in mainline MySQL 5.1 through MySQL 5.1.37 (see
- <xref linkend="news-5-1-37"/>).
+ in mainline MySQL 5.1 through MySQL 5.1.39 (see
+ <xref linkend="news-5-1-39"/>).
</para>
<note>
@@ -179,7 +179,7 @@
</para>
</note>
- <para condition="dynamic:changelog:entrylist" role="5.1.37-ndb-7.1.0:mysqld:all"/>
+ <para condition="dynamic:changelog:entrylist" role="5.1.39-ndb-7.1.0:mysqld:all"/>
</section>
@@ -255,9 +255,9 @@
</itemizedlist>
- <section id="mysql-cluster-news-5-1-37-ndb-7-0-9">
+ <section id="mysql-cluster-news-5-1-39-ndb-7-0-9">
- <title condition="dynamic:changelog:vertitle" role="5.1.37-ndb-7.0.9:mysqld:all"/>
+ <title condition="dynamic:changelog:vertitle" role="5.1.39-ndb-7.0.9:mysqld:all"/>
<para role="release-level">
This release incorporates new features in the
@@ -287,8 +287,8 @@
This release also incorporates all bugfixes and changes made
in previous MySQL Cluster NDB 6.1, 6.2, 6.3, and 7.0 releases,
as well as all bugfixes and feature changes which were added
- in mainline MySQL 5.1 through MySQL 5.1.37 (see
- <xref linkend="news-5-1-37"/>).
+ in mainline MySQL 5.1 through MySQL 5.1.39 (see
+ <xref linkend="news-5-1-39"/>).
</para>
<note>
@@ -299,7 +299,7 @@
</para>
</note>
- <para condition="dynamic:changelog:entrylist" role="5.1.37-ndb-7.0.9:mysqld:all"/>
+ <para condition="dynamic:changelog:entrylist" role="5.1.39-ndb-7.0.9:mysqld:all"/>
</section>
@@ -755,9 +755,9 @@
see <xref linkend="mysql-cluster-changes-5-1-ndb-6-3"/>.
</para>
- <section id="mysql-cluster-news-5-1-37-ndb-6-3-28">
+ <section id="mysql-cluster-news-5-1-39-ndb-6-3-28">
- <title condition="dynamic:changelog:vertitle" role="5.1.37-ndb-6.3.28:mysqld:all"/>
+ <title condition="dynamic:changelog:vertitle" role="5.1.39-ndb-6.3.28:mysqld:all"/>
<para>
This is a bugfix release, fixing recently discovered bugs in
@@ -776,8 +776,8 @@
This release incorporates all bugfixes and changes made in
previous MySQL Cluster NDB 6.3 releases, as well as all
bugfixes and feature changes which were added in mainline
- MySQL 5.1 through MySQL 5.1.37 (see
- <xref linkend="news-5-1-37"/>).
+ MySQL 5.1 through MySQL 5.1.39 (see
+ <xref linkend="news-5-1-39"/>).
</para>
<note>
@@ -788,7 +788,7 @@
</para>
</note>
- <para condition="dynamic:changelog:entrylist" role="5.1.35-ndb-6.3.28:mysqld:all"/>
+ <para condition="dynamic:changelog:entrylist" role="5.1.39-ndb-6.3.28:mysqld:all"/>
</section>
@@ -3855,7 +3855,7 @@
7.0, see <xref linkend="mysql-cluster-changes-5-1-ndb-7-0"/>.
</para>
- <para condition="dynamic:changelog:singledifflist" role="5.1.30-ndb-6.4.0-5.1.37-ndb-7.0.9:mysqld:highlight[cluster,diskdata,clusterapi,incompatiblechange,securityfix]"/>
+ <para condition="dynamic:changelog:singledifflist" role="5.1.30-ndb-6.4.0-5.1.39-ndb-7.0.9:mysqld:highlight[cluster,diskdata,clusterapi,incompatiblechange,securityfix]"/>
</section>
@@ -3878,7 +3878,7 @@
6.3, see <xref linkend="mysql-cluster-changes-5-1-ndb-6-3"/>.
</para>
- <para condition="dynamic:changelog:singledifflist" role="5.1.19-ndb-6.3.0-5.1.37-ndb-6.3.28:mysqld:highlight[cluster,diskdata,clusterapi,incompatiblechange,securityfix]"/>
+ <para condition="dynamic:changelog:singledifflist" role="5.1.19-ndb-6.3.0-5.1.39-ndb-6.3.28:mysqld:highlight[cluster,diskdata,clusterapi,incompatiblechange,securityfix]"/>
</section>
Modified: trunk/refman-5.1/renamed-nodes.txt
===================================================================
--- trunk/refman-5.1/renamed-nodes.txt 2009-10-02 01:59:35 UTC (rev 16920)
+++ trunk/refman-5.1/renamed-nodes.txt 2009-10-02 08:35:07 UTC (rev 16921)
Changed blocks: 1, Lines Added: 3, Lines Deleted: 0; 977 bytes
@@ -442,6 +442,9 @@
mysql-cluster-news-5-1-34-ndb-6-3-26 mysql-cluster-news-5-1-35-ndb-6-3-26 2010-06-25
mysql-cluster-news-5-1-34-ndb-7-0-7 mysql-cluster-news-5-1-35-ndb-7-0-7 2010-06-25
mysql-cluster-news-5-1-35-ndb-6-2-19 mysql-cluster-news-5-1-37-ndb-6-2-19 2010-08-25
+mysql-cluster-news-5-1-37-ndb-6-3-28 mysql-cluster-news-5-1-39-ndb-6-3-28 2010-10-02
+mysql-cluster-news-5-1-37-ndb-7-0-8 mysql-cluster-news-5-1-39-ndb-7-0-8 2010-10-02
+mysql-cluster-news-5-1-37-ndb-7-1-0 mysql-cluster-news-5-1-39-ndb-7-1-0 2010-10-02
mysql-cluster-news-6-4 mysql-cluster-news-7-0 2010-03-15
mysql-cluster-news-combined mysql-cluster-news-series 2010-09-27
mysql-cluster-news-combined-6.1 mysql-cluster-news-6.1-series 2010-09-27
| Thread |
|---|
| • svn commit - mysqldoc@docsrva: r16921 - in trunk: common dynamic-docs/changelog refman-5.1 | jon.stephens | 2 Oct |
