bzr commit into mysql-5.1-telco-6.3 branch (jonas:3135)

[Jonas Oreland]

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

 3135 Jonas Oreland	2009-10-26
      ndb - fix testSystemRestart -n to
        create/destory event-handle to get "fresh" LCP ids

    modified:
      storage/ndb/test/ndbapi/testSystemRestart.cpp
=== modified file 'storage/ndb/test/ndbapi/testSystemRestart.cpp'
--- a/storage/ndb/test/ndbapi/testSystemRestart.cpp	2009-09-15 12:02:04 +0000
+++ b/storage/ndb/test/ndbapi/testSystemRestart.cpp	2009-10-26 08:53:31 +0000
@@ -1681,9 +1681,6 @@ runTO(NDBT_Context* ctx, NDBT_Step* step
     nodeGroupMap.set(nodeGroups[node]);
   }
 
-  int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_CHECKPOINT, 0 };
-  NdbLogEventHandle handle = 
-    ndb_mgm_create_logevent_handle(res.handle, filter);
   struct ndb_logevent event;
 
   Uint32 i = 0;
@@ -1691,6 +1688,10 @@ runTO(NDBT_Context* ctx, NDBT_Step* step
   {
     int val = DumpStateOrd::DihMinTimeBetweenLCP;
     CHECK(res.dumpStateAllNodes(&val, 1) == 0);
+
+    int filter[] = { 15, NDB_MGM_EVENT_CATEGORY_CHECKPOINT, 0 };
+    NdbLogEventHandle handle = 
+      ndb_mgm_create_logevent_handle(res.handle, filter);
     
     Bitmask<256/32> notstopped = nodeGroupMap;
     while(!notstopped.isclear())
@@ -1755,6 +1756,8 @@ runTO(NDBT_Context* ctx, NDBT_Step* step
     
     while(ndb_logevent_get_next(handle, &event, 0) >= 0 &&
           event.type != NDB_LE_LocalCheckpointCompleted);
+
+    ndb_mgm_destroy_logevent_handle(&handle);
     
     i++;
   }


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