bzr push into mysql-5.5-cluster-7.2 branch (jonas.oreland:3818 to 3820)

[Jonas Oreland]

 3820 Jonas Oreland	2012-02-20
      ndb - fix upgrade problem with change of MAX_NDBMT_LQH_WORKERS

    modified:
      storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp
 3819 Jonas Oreland	2012-02-20
      ndb - add missing test prg to 5.5

    modified:
      storage/ndb/test/ndbapi/CMakeLists.txt
 3818 Jonas Oreland	2012-02-20 [merge]
      ndb - merge 71 to 72

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
      storage/ndb/test/run-test/atrt.hpp
      storage/ndb/test/run-test/command.cpp
      storage/ndb/test/run-test/setup.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-02-01 17:39:06 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2012-02-20 21:11:31 +0000
@@ -6009,14 +6009,15 @@ Dbtc::sendRemoveMarker(Signal* signal,
   Uint32 len = 3;
 
   // currently packed signals can not address specific instance
-  bool send_unpacked = getNodeInfo(hostPtr.i).m_lqh_workers > 1;
+  Uint32 cnt_workers = getNodeInfo(hostPtr.i).m_lqh_workers;
+  bool send_unpacked = cnt_workers > 1;
   if (send_unpacked) {
     jam();
     // first word omitted
     memcpy(&signal->theData[0], &Tdata[1], (len - 1) << 2);
     Uint32 Tnode = hostPtr.i;
     Uint32 i;
-    for (i = 0; i < MAX_NDBMT_LQH_WORKERS; i++) {
+    for (i = 0; i < cnt_workers; i++) {
       // wl4391_todo skip workers not part of tx
       Uint32 instanceKey = 1 + i;
       BlockReference ref = numberToRef(DBLQH, instanceKey, Tnode);

=== modified file 'storage/ndb/test/ndbapi/CMakeLists.txt'
--- a/storage/ndb/test/ndbapi/CMakeLists.txt	2011-12-09 12:44:18 +0000
+++ b/storage/ndb/test/ndbapi/CMakeLists.txt	2012-02-20 21:10:49 +0000
@@ -67,6 +67,8 @@ TARGET_LINK_LIBRARIES(testSRBank ndbbank
 ADD_EXECUTABLE(testLimits testLimits.cpp)
 ADD_EXECUTABLE(testSingleUserMode testSingleUserMode.cpp)
 ADD_EXECUTABLE(testIndexStat testIndexStat.cpp)
+ADD_EXECUTABLE(testUpgrade testUpgrade.cpp)
+ADD_EXECUTABLE(testAsynchMultiwait testAsynchMultiwait.cpp)
 
 SET(BINS create_all_tabs create_tab
   drop_all_tabs flexAsynch flexBench
@@ -81,7 +83,9 @@ SET(BINS create_all_tabs create_tab
   DbAsyncGenerator test_event_merge testNdbinfo
   testNativeDefault testLimits testSpj
   testSingleUserMode
-  testIndexStat)
+  testIndexStat
+  testUpgrade
+  testAsynchMultiwait)
 
 IF(MSVC)
   
@@ -95,4 +99,6 @@ FOREACH(B ${BINS})
   TARGET_LINK_LIBRARIES(${B} ndbclient_so)
 ENDFOREACH()
 
+TARGET_LINK_LIBRARIES(testUpgrade mysqlclient)
+
 INSTALL(TARGETS ${BINS} DESTINATION bin)

No bundle (reason: useless for push emails).