bzr push into mysql-5.1-telco-6.3 branch (jonas:3401 to 3402) Bug#11929643

[Jonas Oreland]

 3402 Jonas Oreland	2011-03-28
      ndb - bug#11929643 - mrr scan can hang if aborted while switching ranges

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
 3401 Frazer Clement	2011-03-15
      Improve determinism of rpl_ndb_gap_event

    modified:
      mysql-test/suite/rpl_ndb/t/rpl_ndb_gap_event.test
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-01-30 20:42:21 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2011-03-28 13:14:35 +0000
@@ -8755,6 +8755,8 @@ void Dblqh::closeScanRequestLab(Signal* 
       scanptr.p->scanCompletedStatus = ZTRUE;
       break;
     case ScanRecord::WAIT_CLOSE_SCAN:
+      jam();
+      scanptr.p->scanCompletedStatus = ZTRUE;
     case ScanRecord::WAIT_DELETE_STORED_PROC_ID_SCAN:
       jam();
       /*empty*/;

No bundle (reason: useless for push emails).