bzr commit into mysql-5.1-telco-7.0-spj-scan-vs-scan branch (jonas:3468)

[jonas oreland]

#At file:///home/jonas/src/70-spj-svs/ based on revid:jonas@stripped

 3468 jonas oreland	2011-03-31 [merge]
      ndb - merge 70 to 70-spj

    modified:
      configure.in
      storage/ndb/ndb_configure.m4
      storage/ndb/src/common/util/version.cpp
=== modified file 'configure.in'
--- a/configure.in	2011-02-23 13:22:03 +0000
+++ b/configure.in	2011-03-30 21:16:39 +0000
@@ -12,7 +12,7 @@ dnl
 dnl When changing the major version number please also check the switch
 dnl statement in mysqlbinlog::check_master_version().  You may also need
 dnl to update version.c in ndb.
-AC_INIT([MySQL Server], [5.1.51-ndb-7.0.23], [], [mysql])
+AC_INIT([MySQL Server], [5.1.51-ndb-7.0.24], [], [mysql])
 AC_CONFIG_SRCDIR([sql/mysqld.cc])
 AC_CANONICAL_SYSTEM
 # USTAR format gives us the possibility to store longer path names in

=== modified file 'storage/ndb/ndb_configure.m4'
--- a/storage/ndb/ndb_configure.m4	2011-02-24 07:39:24 +0000
+++ b/storage/ndb/ndb_configure.m4	2011-03-31 07:22:08 +0000
@@ -2,7 +2,7 @@
 # Should be updated when creating a new NDB version
 NDB_VERSION_MAJOR=7
 NDB_VERSION_MINOR=0
-NDB_VERSION_BUILD=23
+NDB_VERSION_BUILD=24
 NDB_VERSION_STATUS=""
 
 dnl for build ndb docs

=== modified file 'storage/ndb/src/common/util/version.cpp'
--- a/storage/ndb/src/common/util/version.cpp	2011-02-01 23:27:25 +0000
+++ b/storage/ndb/src/common/util/version.cpp	2011-03-30 18:23:44 +0000
@@ -96,9 +96,17 @@ struct NdbUpGradeCompatible {
 };
 
 struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
+  { MAKE_VERSION(7,2,NDB_VERSION_BUILD), MAKE_VERSION(7,2,0), UG_Range },
+  { MAKE_VERSION(7,2,NDB_VERSION_BUILD), MAKE_VERSION(7,1,0), UG_Range },
+  { MAKE_VERSION(7,2,NDB_VERSION_BUILD), MAKE_VERSION(7,0,0), UG_Range },       
+
+  { MAKE_VERSION(7,1,NDB_VERSION_BUILD), MAKE_VERSION(7,1,0), UG_Range },        /* From 7.1+ */
+  { MAKE_VERSION(7,1,NDB_VERSION_BUILD), MAKE_VERSION(7,0,0), UG_Range },        /* From 7.0+ */
+  { MAKE_VERSION(7,1,NDB_VERSION_BUILD), MAKE_VERSION(6,4,0), UG_Range },        /* From 6.4+ */
+  { MAKE_VERSION(7,1,NDB_VERSION_BUILD), NDBD_MAX_RECVBYTESIZE_32K, UG_Range },  /* From 6.3.X + */
   { MAKE_VERSION(7,0,NDB_VERSION_BUILD), MAKE_VERSION(7,0,0), UG_Range },
   { MAKE_VERSION(7,0,NDB_VERSION_BUILD), MAKE_VERSION(6,4,0), UG_Range },
-  /* Can only upgrade to 6.4.X from versions >= 6.3.17 due to change
+  /* Can only upgrade to 6.4.X+ from versions >= 6.3.17 due to change
    * in Transporter maximum sent message size
    */
   { MAKE_VERSION(7,0,NDB_VERSION_BUILD), NDBD_MAX_RECVBYTESIZE_32K, UG_Range },

No bundle (reason: revision is a merge).