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

[jonas oreland]

 4546 jonas oreland	2011-09-24
      ndb - fix incorrect time_passed calc, can lead to ending scan-batch too early

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
 4545 jonas oreland	2011-09-23
      ndb - fix a potential mutex deadlock in ndb_mgmd (last minute fix :())

    modified:
      storage/ndb/src/mgmsrv/MgmtSrvr.cpp
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-07-04 13:40:57 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-09-24 09:58:29 +0000
@@ -11347,8 +11347,8 @@ void Dblqh::scanTupkeyRefLab(Signal* sig
     scanReleaseLocksLab(signal);
     return;
   }//if
-  Uint32 time_passed= tcConnectptr.p->tcTimer - cLqhTimeOutCount;
-  if (rows) 
+  Uint32 time_passed= cLqhTimeOutCount - tcConnectptr.p->tcTimer;
+  if (rows)
   {
     if (time_passed > 1) 
     {

No bundle (reason: useless for push emails).