From: Frazer Clement
Date: August 13 2012 3:05pm
Subject: bzr push into mysql-5.1-telco-6.3 branch (frazer.clement:3479 to 3480)
List-Archive: http://lists.mysql.com/commits/144556
Message-Id: <201208131505.q7DF5nJX031990@acsmt357.oracle.com>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit

 3480 Frazer Clement	2012-08-13
      Fix compile failure

    modified:
      storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp
 3479 Frazer Clement	2012-08-13
      Bug #14389746 INCOMPLETE REDO METADATA RELOAD LEADS TO REDO EXHAUSTION
      
      Fix problem with redo log metadata reload at node or system restart.
      
      The redo metadata reload mechanism is modified to avoid reading invalid
      data.  This avoids later problems when iterating over this metadata. 
      
      A new test program (testRedo) is created, and added to the daily-basic 
      suite.

    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/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 11:03:25 +0000
+++ b/storage/ndb/src/kernel/blocks/dblqh/DblqhMain.cpp	2012-08-13 15:00:28 +0000
@@ -21599,8 +21599,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
 
 }//Dblqh::execDUMP_STATE_ORD()
 

No bundle (reason: useless for push emails).