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

[Jonas Oreland]

 4510 Jonas Oreland	2011-09-09
      ndb - make sure not to set any more variables for plain old ndbd...or it will be confused

    modified:
      storage/ndb/src/kernel/vm/Configuration.cpp
 4509 Jonas Oreland	2011-09-08
      ndb - fix newly introduced bug, where ACC memory didn't get divided with no of LDM threads

    modified:
      storage/ndb/src/kernel/ndbd.cpp
      storage/ndb/src/kernel/vm/Configuration.cpp
=== modified file 'storage/ndb/src/kernel/vm/Configuration.cpp'
--- a/storage/ndb/src/kernel/vm/Configuration.cpp	2011-09-08 11:49:24 +0000
+++ b/storage/ndb/src/kernel/vm/Configuration.cpp	2011-09-09 09:03:05 +0000
@@ -463,6 +463,9 @@ Configuration::setupConfiguration(){
   do
   {
     globalData.isNdbMt = NdbIsMultiThreaded();
+    if (!globalData.isNdbMt)
+      break;
+
     globalData.isNdbMtLqh = true;
     {
       if (m_thr_config.getMtClassic())

No bundle (reason: useless for push emails).