bzr push into mysql-5.1 branch (jonas:2731 to 2732)

[Jonas Oreland]

 2732 Jonas Oreland	2008-11-11
      ndb - fix previous bug fix, dirty-read sets simple flag i.e check both
modified:
  storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp

 2731 Jonas Oreland	2008-11-11
      ndb - test_event, drop any old event before trying to create one
modified:
  storage/ndb/test/ndbapi/test_event.cpp

=== modified file 'storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2008-11-07 08:01:33 +0000
+++ b/storage/ndb/src/kernel/blocks/dbtc/DbtcMain.cpp	2008-11-11 09:33:56 +0000
@@ -3092,12 +3092,13 @@ void Dbtc::tckeyreq050Lab(Signal* signal
 
   Uint8 Toperation = regTcPtr->operation;
   Uint8 TopSimple = regTcPtr->opSimple;
+  Uint8 TopDirty = regTcPtr->dirtyOp;
   tnoOfBackup = tnodeinfo & 3;
   tnoOfStandby = (tnodeinfo >> 8) & 3;
  
   regCachePtr->fragmentDistributionKey = (tnodeinfo >> 16) & 255;
   if (Toperation == ZREAD || Toperation == ZREAD_EX) {
-    if (TopSimple == 1){
+    if (TopSimple == 1 && TopDirty == 0){
       jam();
       /*-------------------------------------------------------------*/
       /*       A SIMPLE READ CAN SELECT ANY OF THE PRIMARY AND       */