bzr push into mysql-5.5-cluster-7.2 branch (ole.john.aske:3921 to 3922)

[Ole John Aske]

 3922 Ole John Aske	2012-05-22
      This is the 'various.patch' being part of Mikael R patch set:
      
      'Patches used in benchmark tree with Intel'

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
 3921 Frazer Clement	2012-05-22 [merge]
      Merge 7.1->7.2

    modified:
      storage/ndb/include/kernel/GlobalSignalNumbers.h
      storage/ndb/include/kernel/signaldata/LCP.hpp
      storage/ndb/include/kernel/signaldata/SignalData.hpp
      storage/ndb/src/common/debugger/signaldata/LCP.cpp
      storage/ndb/src/common/debugger/signaldata/SignalDataPrint.cpp
      storage/ndb/src/common/debugger/signaldata/SignalNames.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.cpp
      storage/ndb/src/kernel/blocks/backup/Backup.hpp
      storage/ndb/src/kernel/blocks/backup/BackupInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/test/include/NdbMgmd.hpp
      storage/ndb/test/ndbapi/testNodeRestart.cpp
      storage/ndb/test/run-test/daily-devel-tests.txt
=== modified file 'storage/ndb/src/kernel/vm/mt.cpp'
--- a/storage/ndb/src/kernel/vm/mt.cpp	2012-03-21 12:31:02 +0000
+++ b/storage/ndb/src/kernel/vm/mt.cpp	2012-05-22 11:19:59 +0000
@@ -3739,7 +3739,7 @@ mt_job_thread_main(void *thr_arg)
 
     /**
      * prefill our thread local send buffers
-     *   up to THR_MINIMUM_SEND_BUFFERS (1Mb)
+     *   up to THR_SEND_BUFFER_PRE_ALLOC (1Mb)
      *
      * and if this doesnt work pack buffers before start to execute signals
      */

No bundle (reason: useless for push emails).