From: Frazer Clement
Date: August 13 2012 3:08pm
Subject: bzr push into mysql-5.1-telco-7.1 branch (frazer.clement:4591 to 4592)
List-Archive: http://lists.mysql.com/commits/144555
Message-Id: <201208131508.q7DF8Oer019642@acsmt358.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 4592 Frazer Clement	2012-08-13 [merge]
      Merge 7.0->7.1

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
 4591 Frazer Clement	2012-08-13 [merge]
      Merge 7.0->7.1

    added:
      storage/ndb/test/ndbapi/testRedo.cpp
    modified:
      storage/ndb/include/mgmapi/ndb_logevent.h
      storage/ndb/src/kernel/blocks/dblqh/Dblqh.hpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhInit.cpp
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
      storage/ndb/src/mgmapi/ndb_logevent.cpp
      storage/ndb/test/ndbapi/CMakeLists.txt
      storage/ndb/test/ndbapi/Makefile.am
      storage/ndb/test/run-test/daily-basic-tests.txt
=== modified file 'storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp'
--- a/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2012-08-13 13:39:58 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2012-08-13 15:06:12 +0000
@@ -23628,8 +23628,10 @@ Dblqh::execDUMP_STATE_ORD(Signal* signal
     }
   }
 
+#if defined VM_TRACE || defined ERROR_INSERT
   if (arg == 2396 && signal->length() == 2)
       cmaxLogFilesInPageZero_DUMP = dumpState->args[1];
+#endif
 
   if (arg == 2397)
   {

No bundle (reason: useless for push emails).