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

[Jonas Oreland]

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

 3187 Jonas Oreland	2010-04-28 [merge]
      merge 62 to 63

    modified:
      storage/ndb/src/kernel/main.cpp
      storage/ndb/src/kernel/vm/GlobalData.hpp
=== modified file 'storage/ndb/src/kernel/main.cpp'
--- a/storage/ndb/src/kernel/main.cpp	2009-08-03 13:03:32 +0000
+++ b/storage/ndb/src/kernel/main.cpp	2010-04-28 12:18:56 +0000
@@ -93,7 +93,13 @@ void childExit(int code, Uint32 currentS
   fprintf(child_info_file_w, "\n");
   fclose(child_info_file_r);
   fclose(child_info_file_w);
+
+// gcov will not produce results when using _exit
+#ifdef HAVE_gcov
   exit(code);
+#else
+  _exit(code);
+#endif
 }
 
 void childAbort(int code, Uint32 currentStartPhase)

=== modified file 'storage/ndb/src/kernel/vm/GlobalData.hpp'
--- a/storage/ndb/src/kernel/vm/GlobalData.hpp	2009-05-26 18:53:34 +0000
+++ b/storage/ndb/src/kernel/vm/GlobalData.hpp	2010-04-28 12:16:06 +0000
@@ -79,7 +79,7 @@ struct GlobalData {
     gcp_timer_limit = 0;
 #endif
   }
-  ~GlobalData(){}
+  ~GlobalData(){ m_global_page_pool.clear(); m_shared_page_pool.clear(); }
   
   void             setBlock(BlockNumber blockNo, SimulatedBlock * block);
   SimulatedBlock * getBlock(BlockNumber blockNo);


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