bzr push into mysql-5.1-telco-7.0 branch (frazer.clement:4881 to 4882)

[Frazer Clement]

 4882 Frazer Clement	2012-03-13
      Windows fix attempt

    modified:
      storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp
 4881 Mauritz Sundell	2012-03-13
      ndb - dbacc - use DynArr256 for page directory
      
      this will relax one size limitation of hash index
      of one partition, that is the number of rows are
      now not limited to ~45M, but note where are other
      limitations that can be more restrictive.
      
      pages are still from static pool (IndexMemory).
      localkey length into dbtup are still only one word.

    modified:
      storage/ndb/include/kernel/kernel_config_parameters.h
      storage/ndb/src/kernel/blocks/dbacc/Dbacc.hpp
      storage/ndb/src/kernel/blocks/dbacc/DbaccInit.cpp
      storage/ndb/src/kernel/blocks/dbacc/DbaccMain.cpp
      storage/ndb/src/kernel/blocks/record_types.hpp
      storage/ndb/src/kernel/vm/Configuration.cpp
=== modified file 'storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp'
--- a/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp	2012-03-12 15:16:41 +0000
+++ b/storage/ndb/test/ndbapi/bench/mainAsyncGenerator.cpp	2012-03-13 15:12:27 +0000
@@ -39,7 +39,13 @@ static int   minEventSendPoll;
 static int   forceSendPoll;
 static bool  useNdbRecord;
 static bool  useCombUpd;
+#ifdef __cplusplus
+extern "C" {
+#endif
 int          subscriberCount;
+#ifdef __cplusplus
+}
+#endif
 static bool  robustMode;
 
 static ThreadData *data;

No bundle (reason: useless for push emails).