List:Commits« Previous MessageNext Message »
From:jonas oreland Date:July 4 2011 8:25am
Subject:bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4498 to 4501)
View as plain text  
 4501 jonas oreland	2011-07-04
      ndb - fix NDBT_Find vs. windows....ugly fix...

    modified:
      storage/ndb/test/src/NDBT_Find.cpp
 4500 jonas oreland	2011-07-04
      ndb - another compiler warning

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
 4499 jonas oreland	2011-07-04
      ndb - another compiler warning

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
 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
=== modified file 'storage/ndb/src/mgmsrv/MgmtSrvr.cpp'
--- a/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2011-07-03 16:30:29 +0000
+++ b/storage/ndb/src/mgmsrv/MgmtSrvr.cpp	2011-07-04 08:10:47 +0000
@@ -891,6 +891,7 @@ MgmtSrvr::get_packed_config_from_node(No
   }
   // Should never come here
   require(false);
+  DBUG_RETURN(false);
 }
 
 MgmtSrvr::~MgmtSrvr()
@@ -2958,6 +2959,7 @@ MgmtSrvr::trp_deliver_signal(const NdbAp
       Uint32 theData[25];
       EventReport repData;
     };
+    bzero(theData, sizeof(theData));
     EventReport * event = &repData;
     event->setEventType(NDB_LE_Disconnected);
     event->setNodeId(_ownNodeId);

=== modified file 'storage/ndb/test/src/NDBT_Find.cpp'
--- a/storage/ndb/test/src/NDBT_Find.cpp	2011-02-02 00:40:07 +0000
+++ b/storage/ndb/test/src/NDBT_Find.cpp	2011-07-04 08:23:19 +0000
@@ -48,11 +48,22 @@ NDBT_find_binary(BaseString& name, const
     {
       // Sucess, found the binary. Convert path to absolute and return it
       char realpath_buf[PATH_MAX];
+#ifndef _WIN32
       if (realpath(path.c_str(), realpath_buf) == NULL)
       {
         fprintf(stderr, "Could not convert '%s' to realpath\n", path.c_str());
         abort();
       }
+#else
+      int ret= GetFullPathName(path.c_str(), sizeof(realpath_buf),
+                               realpath_buf, NULL);
+      if (ret == 0 || ret >= sizeof(realpath_buf))
+      {
+        fprintf(stderr, "Could not convert '%s' with GetFullPathName\n",
+                path.c_str());
+        abort();
+      }
+#endif
 
       name.assign(realpath_buf);
       return;

No bundle (reason: useless for push emails).
Thread
bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4498 to 4501) jonas oreland4 Jul