bzr push into mysql-5.1-telco-6.3 branch (magnus.blaudd:2964 to 2965)

[Magnus Blåudd]

 2965 Magnus Blåudd	2009-05-20 [merge]
      Merge

    modified:
      storage/ndb/src/ndbapi/ClusterMgr.cpp
 2964 Jonas Oreland	2009-05-20 [merge]
      merge 62 to 63

    modified:
      mysql-test/valgrind.supp
=== modified file 'storage/ndb/src/ndbapi/ClusterMgr.cpp'
--- a/storage/ndb/src/ndbapi/ClusterMgr.cpp	2009-01-12 13:11:43 +0000
+++ b/storage/ndb/src/ndbapi/ClusterMgr.cpp	2009-05-20 10:27:06 +0000
@@ -603,7 +603,7 @@ ArbitMgr::ArbitMgr(TransporterFacade & _
 
   theInputTimeout = 0;
   theInputFull = false;
-  memset(&theInputFull, 0, sizeof(theInputFull));
+  memset(&theInputBuffer, 0, sizeof(theInputBuffer));
   theState = StateInit;
 
   memset(&theStartReq, 0, sizeof(theStartReq));

Attachment: [text/bzr-bundle] bzr/[e-mail]