bzr push into mysql-5.1-telco-7.0 branch (jonas.oreland:4834 to 4835)

[Jonas Oreland]

 4835 Jonas Oreland	2012-01-30
      ndb - activate higher threadcounts (for 7.2)

    modified:
      storage/ndb/include/kernel/ndb_limits.h
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
 4834 Jonas Oreland	2012-01-30
      ndb - bug#13633845 - try to improve inconsistent transporter send buffer handling

    modified:
      storage/ndb/include/mgmapi/mgmapi_config_parameters.h
      storage/ndb/include/transporter/TransporterRegistry.hpp
      storage/ndb/src/common/transporter/TransporterRegistry.cpp
      storage/ndb/src/kernel/ndbd.cpp
      storage/ndb/src/kernel/vm/Configuration.cpp
      storage/ndb/src/kernel/vm/Emulator.hpp
      storage/ndb/src/kernel/vm/dummy_nonmt.cpp
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
      storage/ndb/src/ndbapi/TransporterFacade.cpp
=== modified file 'storage/ndb/include/kernel/ndb_limits.h'
--- a/storage/ndb/include/kernel/ndb_limits.h	2012-01-18 09:29:20 +0000
+++ b/storage/ndb/include/kernel/ndb_limits.h	2012-01-30 14:53:29 +0000
@@ -201,18 +201,21 @@
 #define NDBMT_BLOCK_INSTANCE_BITS 7
 
 #define NDB_DEFAULT_LOG_PARTS 4
-#define NDB_MAX_LOG_PARTS     4
-#define MAX_NDBMT_LQH_WORKERS NDB_MAX_LOG_PARTS
-#define MAX_NDBMT_LQH_THREADS NDB_MAX_LOG_PARTS
 
 #if NDB_VERSION_D < NDB_MAKE_VERSION(7,2,0)
-#define MAX_NDBMT_TC_THREADS  2
+#define NDB_MAX_LOG_PARTS          4
+#define MAX_NDBMT_TC_THREADS       2
+#define MAX_NDBMT_RECEIVE_THREADS  1
+#define MAX_NDBMT_SEND_THREADS     0
 #else
-#define MAX_NDBMT_TC_THREADS  4
+#define NDB_MAX_LOG_PARTS         16
+#define MAX_NDBMT_TC_THREADS      16
+#define MAX_NDBMT_RECEIVE_THREADS  8
+#define MAX_NDBMT_SEND_THREADS     8
 #endif
 
-#define MAX_NDBMT_SEND_THREADS    0
-#define MAX_NDBMT_RECEIVE_THREADS 1
+#define MAX_NDBMT_LQH_WORKERS NDB_MAX_LOG_PARTS
+#define MAX_NDBMT_LQH_THREADS NDB_MAX_LOG_PARTS
 
 #define NDB_FILE_BUFFER_SIZE (256*1024)
 

=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2012-01-30 14:28:55 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2012-01-30 14:53:29 +0000
@@ -1118,7 +1118,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     ConfigInfo::CI_USED,
     CI_RESTART_INITIAL,
     ConfigInfo::CI_INT,
-    "4",
+    STR_VALUE(NDB_DEFAULT_LOG_PARTS),
     "4",
     STR_VALUE(NDB_MAX_LOG_PARTS)
   },

No bundle (reason: useless for push emails).