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

[jonas oreland]

 4840 jonas oreland	2012-01-31
      ndb - fix typo

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
 4839 jonas oreland	2012-01-31
      ndb - wl-5929 - add various padding to separate variables accessed by multiple threads

    modified:
      storage/ndb/src/kernel/vm/mt.cpp
=== modified file 'storage/ndb/src/kernel/vm/mt.cpp'
--- a/storage/ndb/src/kernel/vm/mt.cpp	2012-01-31 15:45:02 +0000
+++ b/storage/ndb/src/kernel/vm/mt.cpp	2012-01-31 16:36:20 +0000
@@ -222,7 +222,7 @@ struct thr_wait
   NdbMutex *m_mutex;
   NdbCondition *m_cond;
   bool m_need_wakeup;
-  char padding[NDB_CL_PAD_SZ(sizeof(bool) + (2*sizeof(void*)))];
+  char padding[NDB_CL_PADSZ(sizeof(bool) + (2*sizeof(void*)))];
   thr_wait() : m_need_wakeup(false), m_mutex(0), m_cond(0) {}
 
   void init() {

No bundle (reason: useless for push emails).