bzr commit into mysql-5.1-telco-6.3 branch (jonas:3307) Bug#55641

[Jonas Oreland]

#At file:///home/jonas/src/telco-6.3/ based on revid:jonas@stripped

 3307 Jonas Oreland	2010-09-29
      ndb - bug#55641 - followup fix, fix check_switchover

    modified:
      storage/ndb/test/ndbapi/test_event.cpp
=== modified file 'storage/ndb/test/ndbapi/test_event.cpp'
--- a/storage/ndb/test/ndbapi/test_event.cpp	2010-09-06 08:14:08 +0000
+++ b/storage/ndb/test/ndbapi/test_event.cpp	2010-09-29 07:26:07 +0000
@@ -687,6 +687,7 @@ int runEventApplier(NDBT_Context* ctx, N
 
 	  }
 
+          Uint32 type = pOp->getEventType();
 	  switch (pOp->getEventType()) {
 	  case NdbDictionary::Event::TE_INSERT:
 	    if (op->writeTuple())
@@ -815,7 +816,13 @@ int runEventApplier(NDBT_Context* ctx, N
 
 	  if (trans->getNdbError().status == NdbError::PermanentError)
 	  {
-	    g_err << "Ignoring execute failed "
+	    g_err << "Ignoring execute failed type: "
+                  << (type == NdbDictionary::Event::TE_INSERT ? "INS" :
+                      type == NdbDictionary::Event::TE_UPDATE ? "UPD" :
+                      type == NdbDictionary::Event::TE_DELETE ? "DEL" : "?")
+                  << " gci: "
+                  << Uint32(curr_gci >> 32) << "/" << Uint32(curr_gci) 
+                  << " - "
 		  << trans->getNdbError().code << " "
 		  << trans->getNdbError().message << endl;
 	  
@@ -1027,11 +1034,14 @@ int runRestarter(NDBT_Context* ctx, NDBT
 
     int id = lastId % restarter.getNumDbNodes();
     int nodeId = restarter.getDbNodeId(id);
-    ndbout << "Restart node " << nodeId << endl; 
+    ndbout << "Restart node " << nodeId;
     if (abort == false && ((i % 3) == 0))
     {
+      ndbout << " (error 13043)" << endl;
       restarter.insertErrorInNode(nodeId, 13043);
     }
+    else
+      ndbout << endl;
 
     if(restarter.restartOneDbNode(nodeId, false, false, abort) != 0){
       g_err << "Failed to restartNextDbNode" << endl;


Attachment: [text/bzr-bundle] bzr/[e-mail]