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

[jonas oreland]

 4663 jonas oreland	2011-11-11
      ndb - fix incorrect #define, causing assert before first signal, when starting ndbmtd with 2 dbtc threads

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
 4662 jonas oreland	2011-11-11
      ndb - fix some more compiler warnings (unused variables)

    modified:
      storage/ndb/src/kernel/blocks/dbtux/DbtuxScan.cpp
      storage/ndb/src/kernel/blocks/dbtux/DbtuxStat.cpp
=== modified file 'storage/ndb/src/kernel/vm/mt.cpp'
--- a/storage/ndb/src/kernel/vm/mt.cpp	2011-10-07 08:07:21 +0000
+++ b/storage/ndb/src/kernel/vm/mt.cpp	2011-11-11 17:59:49 +0000
@@ -76,7 +76,7 @@ static const Uint32 MAX_SIGNALS_BEFORE_W
 #define MAX_THREADS (NUM_MAIN_THREADS +       \
                      MAX_NDBMT_LQH_THREADS +  \
                      MAX_NDBMT_TC_THREADS + 1)
-#define MAX_BLOCK_INSTANCES (MAX_THREADS)
+#define MAX_BLOCK_INSTANCES (MAX_THREADS+1)
 
 /* If this is too small it crashes before first signal. */
 #define MAX_INSTANCES_PER_THREAD (16 + 8 * MAX_NDBMT_LQH_THREADS)

No bundle (reason: useless for push emails).