bzr push into mysql-5.1 branch (jonas:2687)

[Jonas Oreland]

 2687 Jonas Oreland	2008-09-04 [merge]
      merge 6.2 to 6.3
modified:
  storage/ndb/test/src/CpcClient.cpp

=== modified file 'storage/ndb/test/src/CpcClient.cpp'
--- a/storage/ndb/test/src/CpcClient.cpp	2007-03-22 11:35:55 +0000
+++ b/storage/ndb/test/src/CpcClient.cpp	2008-09-04 13:31:41 +0000
@@ -137,7 +137,7 @@ SimpleCpcClient::stop_process(Uint32 id,
     ret->get("errormessage", msg);
     reply.put("errormessage", msg.c_str());
   }
-
+  delete ret;
   return status;
 }
 
@@ -199,6 +199,8 @@ SimpleCpcClient::start_process(Uint32 id
     reply.put("errormessage", msg.c_str());
   }
 
+  delete ret;
+
   return status;
 }
 
@@ -232,6 +234,8 @@ SimpleCpcClient::undefine_process(Uint32
     reply.put("errormessage", msg.c_str());
   }
 
+  delete ret;
+
   return status;
 }
 
@@ -346,13 +350,13 @@ SimpleCpcClient::define_process(Process 
   }
 
   p.m_id = id;
-  
+  delete ret;
   return status;
 }
 
 int
 SimpleCpcClient::list_processes(Vector<Process> &procs, Properties& reply) {
-  int start, end, entry; 
+  int start = 0, end = 0, entry; 
   const ParserRow_t list_reply[] = {
     CPC_CMD("start processes", &start, ""),
     CPC_CMD("end processes", &end, ""),
@@ -390,8 +394,10 @@ SimpleCpcClient::list_processes(Vector<P
     void *p;
     cpc_recv(list_reply, &proc, &p);
 
+    end++;
     if(p == &start)
     {
+      start = 1;
       /* do nothing */
     }
     else if(p == &end)
@@ -400,17 +406,27 @@ SimpleCpcClient::list_processes(Vector<P
     }
     else if(p == &entry)
     {
-      if(proc != NULL){
+      if(proc != NULL)
+      {
 	Process p;
 	convert(* proc, p);
 	procs.push_back(p);
       }
+      else
+      {
+        ndbout_c("JONAS: start: %d loop: %d cnt: %u got p == &entry with proc == NULL",
+                 start, end, procs.size());
+      }
     }
     else
     {
       ndbout_c("internal error: %d", __LINE__);
       return -1;
     }
+    if (proc)
+    {
+      delete proc;
+    }
   }
   return 0;
 }