bzr push into mysql-5.1 branch (pekka:2865) WL#4391

[Pekka Nousiainen]

 2865 Pekka Nousiainen	2008-09-30
      wl#4391 fix
      Some debug stuff was outside #ifdef VM_TRACE.
modified:
  storage/ndb/src/kernel/blocks/pgman.cpp
  storage/ndb/src/kernel/vm/SimulatedBlock.hpp

=== modified file 'storage/ndb/src/kernel/blocks/pgman.cpp'
--- a/storage/ndb/src/kernel/blocks/pgman.cpp	2008-09-30 15:11:30 +0000
+++ b/storage/ndb/src/kernel/blocks/pgman.cpp	2008-09-30 17:09:29 +0000
@@ -390,8 +390,9 @@ Pgman::seize_page_entry(Ptr<Page_entry>&
   {
     new (ptr.p) Page_entry(file_no, page_no);
     m_page_hashlist.add(ptr);
-
+#ifdef VM_TRACE
     ptr.p->m_this = this;
+#endif
     D("seize_page_entry");
     D(ptr);
 
@@ -691,7 +692,9 @@ void
 Pgman::do_stats_loop(Signal* signal)
 {
   D("do_stats_loop");
+#ifdef VM_TRACE
   verify_all();
+#endif
   Uint32 delay = m_param.m_stats_loop_delay;
   signal->theData[0] = PgmanContinueB::STATS_LOOP;
   sendSignalWithDelay(PGMAN_REF, GSN_CONTINUEB, signal, delay, 1);

=== modified file 'storage/ndb/src/kernel/vm/SimulatedBlock.hpp'
--- a/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2008-09-30 15:07:47 +0000
+++ b/storage/ndb/src/kernel/vm/SimulatedBlock.hpp	2008-09-30 17:09:29 +0000
@@ -756,6 +756,9 @@ static void debugOutUnlock() \
 static const char* debugOutTag(char* buf, int line) \
   { return debugOutBlock()->debugOutTag(buf, line); } \
 static void debugOutDefines()
+#else
+#define DEBUG_OUT_DEFINES(blockNo) \
+static void debugOutDefines()
 #endif
 
 inline