bzr push into mysql-5.1-telco-7.0 branch (jonas:3945 to 3946)

[Jonas Oreland]

 3946 Jonas Oreland	2010-11-05
      ndb - don't clear old backup on windows...as it doesnt work

    modified:
      storage/ndb/test/src/NdbBackup.cpp
 3945 Jonas Oreland	2010-11-05 [merge]
      ndb - merge 63 to 70

    modified:
      storage/ndb/test/ndbapi/testNdbApi.cpp
      storage/ndb/test/ndbapi/testPartitioning.cpp
=== modified file 'storage/ndb/test/src/NdbBackup.cpp'
--- a/storage/ndb/test/src/NdbBackup.cpp	2010-09-23 08:24:52 +0000
+++ b/storage/ndb/test/src/NdbBackup.cpp	2010-11-05 10:47:24 +0000
@@ -49,6 +49,7 @@ NdbBackup::clearOldBackups()
 
   int retCode = 0;
 
+#ifndef _WIN32
   for(size_t i = 0; i < ndbNodes.size(); i++)
   {
     int nodeId = ndbNodes[i].node_id;
@@ -73,6 +74,7 @@ NdbBackup::clearOldBackups()
     if (res && retCode == 0)
       retCode = res;
   }
+#endif
 
   return retCode;
 }

No bundle (reason: useless for push emails).