bzr commit into mysql-5.1-telco-7.0 branch (jonas:2904) Bug#44294

[Jonas Oreland]

#At file:///home/jonas/src/64-upgrade/

 2904 Jonas Oreland	2009-04-15
      ndb - bug#44294 - part I - enable upgrade in version.c (broke when changing from 6.4 to 7.0
modified:
  storage/ndb/src/common/util/version.c

=== modified file 'storage/ndb/src/common/util/version.c'
--- a/storage/ndb/src/common/util/version.c	2008-08-26 14:05:01 +0000
+++ b/storage/ndb/src/common/util/version.c	2009-04-15 13:55:56 +0000
@@ -110,10 +110,12 @@ void ndbSetOwnVersion() {}
 
 #ifndef TEST_VERSION
 struct NdbUpGradeCompatible ndbCompatibleTable_full[] = {
+  { 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
    * in Transporter maximum sent message size
    */
-  { MAKE_VERSION(6,4,NDB_VERSION_BUILD), NDBD_MAX_RECVBYTESIZE_32K, UG_Range },
+  { MAKE_VERSION(7,0,NDB_VERSION_BUILD), NDBD_MAX_RECVBYTESIZE_32K, UG_Range },
   { MAKE_VERSION(6,3,NDB_VERSION_BUILD), MAKE_VERSION(6,2,1), UG_Range },
 
   { MAKE_VERSION(6,2,NDB_VERSION_BUILD), MAKE_VERSION(6,2,1), UG_Range },