bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4497 to 4498)

[jonas oreland]

 4498 jonas oreland	2011-07-04
      ndb - unbreak upgrade with 7.0 connecting to 6.3 ndb_mgmd

    modified:
      storage/ndb/src/mgmapi/mgmapi.cpp
 4497 jonas oreland	2011-07-03
      ndb - fix compiler warning

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
=== modified file 'storage/ndb/src/mgmapi/mgmapi.cpp'
--- a/storage/ndb/src/mgmapi/mgmapi.cpp	2011-07-01 17:15:00 +0000
+++ b/storage/ndb/src/mgmapi/mgmapi.cpp	2011-07-04 07:23:48 +0000
@@ -2496,18 +2496,21 @@ ndb_mgm_get_configuration2(NdbMgmHandle
     args.put("nodetype", nodetype);
   }
 
-  if (check_version_ge(handle->mgmd_version(),
-                       NDB_MAKE_VERSION(7,1,16),
-                       NDB_MAKE_VERSION(7,0,27),
-                       0))
+  if (from_node != 0)
   {
-    args.put("from_node", from_node);
-  }
-  else
-  {
-    SET_ERROR(handle, NDB_MGM_GET_CONFIG_FAILED,
-              "The mgm server does not support getting config from_node");
-    DBUG_RETURN(0);
+    if (check_version_ge(handle->mgmd_version(),
+                         NDB_MAKE_VERSION(7,1,16),
+                         NDB_MAKE_VERSION(7,0,27),
+                         0))
+    {
+      args.put("from_node", from_node);
+    }
+    else
+    {
+      SET_ERROR(handle, NDB_MGM_GET_CONFIG_FAILED,
+                "The mgm server does not support getting config from_node");
+      DBUG_RETURN(0);
+    }
   }
 
   const ParserRow<ParserDummy> reply[] = {

No bundle (reason: useless for push emails).