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

[Jonas Oreland]

 4847 Jonas Oreland	2012-02-02
      ndb - undeprecate TotalSendBufferMemory (as it now actually works in all places)

    modified:
      storage/ndb/src/mgmsrv/ConfigInfo.cpp
 4846 Jonas Oreland	2012-02-02
      ndb - this patch removes some methods on NdbLogPartInfo, that makes incorrect assumptions (when increasing #LQHs). The users of these functions (2) are modified to solve problem differently

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhCommon.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxProxy.hpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
=== modified file 'storage/ndb/src/mgmsrv/ConfigInfo.cpp'
--- a/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2012-01-30 14:53:29 +0000
+++ b/storage/ndb/src/mgmsrv/ConfigInfo.cpp	2012-02-02 20:57:02 +0000
@@ -1705,7 +1705,7 @@ const ConfigInfo::ParamInfo ConfigInfo::
     "TotalSendBufferMemory",
     DB_TOKEN,
     "Total memory to use for send buffers in all transporters",
-    ConfigInfo::CI_DEPRECATED,
+    ConfigInfo::CI_USED,
     false,
     ConfigInfo::CI_INT,
     "0",

No bundle (reason: useless for push emails).