bzr push into mysql-5.1-telco-7.1 branch (jonas:3132 to 3133)

[Jonas Oreland]

 3133 Jonas Oreland	2009-11-03 [merge]
      merge 70 to 71

    modified:
      storage/ndb/src/kernel/vm/ArrayPool.hpp
      storage/ndb/src/ndbapi/ndberror.c
 3132 Magnus Blåudd	2009-11-03 [merge]
      Merge 7.0 -> 7.1

    modified:
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.hpp
=== modified file 'storage/ndb/src/kernel/vm/ArrayPool.hpp'
--- a/storage/ndb/src/kernel/vm/ArrayPool.hpp	2009-09-25 13:38:00 +0000
+++ b/storage/ndb/src/kernel/vm/ArrayPool.hpp	2009-11-03 14:38:26 +0000
@@ -1098,6 +1098,7 @@ ArrayPool<T>::seizeChunk(Uint32 & cnt, P
     return true;
   }
 
+  ptr.p = NULL;
   return false;
 }
 

=== modified file 'storage/ndb/src/ndbapi/ndberror.c'
--- a/storage/ndb/src/ndbapi/ndberror.c	2009-10-02 13:58:00 +0000
+++ b/storage/ndb/src/ndbapi/ndberror.c	2009-11-03 14:40:27 +0000
@@ -168,7 +168,7 @@ ErrorBundle ErrorCodes[] = {
    * TemporaryResourceError
    */
   { 217,  DMEC, TR, "217" },
-  { 218,  DMEC, TR, "218" },
+  { 218,  DMEC, TR, "Out of LongMessageBuffer" },
   { 219,  DMEC, TR, "219" },
   { 233,  DMEC, TR,
     "Out of operation records in transaction coordinator (increase MaxNoOfConcurrentOperations)" },

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