bzr push into mysql-5.1-telco-7.0 branch (mauritz.sundell:5072 to 5073)

[Mauritz Sundell]

 5073 Mauritz Sundell	2013-01-22
      ndb - testDict made to work on systems with only one nodegroup

    modified:
      storage/ndb/test/ndbapi/testDict.cpp
 5072 Jan Wedvik	2013-01-21
      This is a commit for Bug#14488185 (NDBMTD CRASH 2341 IN SIMULATEDBLOCK.CPP DUE 
      TO LACK OF LONGMESSAGEBUFFER MEMORY). This commit does not fix the bug, but is
      intended to help pinpointing the cause of the bug. The root cause is believed
      to be one or more leaks of section segments. These leaks eventually empties the
      pool of section segments. The data node then crashes when it tries to allocate
      segments. This commit should make the data node crash when a leak of segments 
      is seen. Hopefully, this will provide a stack trace and/ot trace files that
      can help us to identify the actual bug.

    modified:
      storage/ndb/src/kernel/vm/SimulatedBlock.cpp
      storage/ndb/src/kernel/vm/SimulatedBlock.hpp
      storage/ndb/src/kernel/vm/VMSignal.hpp
=== modified file 'storage/ndb/test/ndbapi/testDict.cpp'
--- a/storage/ndb/test/ndbapi/testDict.cpp	2012-11-23 07:23:10 +0000
+++ b/storage/ndb/test/ndbapi/testDict.cpp	2013-01-22 22:48:48 +0000
@@ -1,5 +1,5 @@
 /*
-   Copyright (c) 2003, 2011, Oracle and/or its affiliates. All rights reserved.
+   Copyright (c) 2003, 2011, 2013, Oracle and/or its affiliates. All rights reserved.
 
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -9254,7 +9254,7 @@ runBug14645319(NDBT_Context* ctx, NDBT_S
     { "Extend hashmap",
       3, 120, 7, NDB_DEFAULT_HASHMAP_BUCKETS, NDB_DEFAULT_HASHMAP_BUCKETS },
     { "Keep old hashmap size since old size not multiple of old fragment count",
-      7, 120, 10, 60, 120 },
+      5, 84, 7, 42, 84 },
     { "Shrink hashmap",
       3, 120, 6, 60, 60 },
   };

No bundle (reason: useless for push emails).