bzr push into mysql-5.1-telco-7.1 branch (mauritz.sundell:4704 to 4705)

[Mauritz Sundell]

 4705 Mauritz Sundell	2013-01-22 [merge]
      merge 7.0 -> 7.1

    modified:
      storage/ndb/test/ndbapi/testDict.cpp
 4704 Jan Wedvik	2013-01-21 [merge]
      Merge 7.0->7.1.

    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).