bk commit into 5.1 tree (tomas:1.2409)

[tomas]

Below is the list of changes that have just been committed into a local
5.1 repository of tomas. When tomas does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2409 07/01/30 09:54:01 tomas@stripped +4 -0
  (recommit from 5.1-wl2325-5.0-drop6)
  Change level on StartREDOLog to make it default come up in cluster log
  Make ndbd_redo_log_reader be build default

  storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp
    1.10 07/01/30 09:53:36 tomas@stripped +17 -4
    add possiblibty to dump inly header/lap

  storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp
    1.9 07/01/30 09:53:36 tomas@stripped +1 -1
    add possiblibty to dump inly header/lap

  storage/ndb/src/kernel/blocks/dblqh/Makefile.am
    1.10 07/01/30 09:53:36 tomas@stripped +1 -1
    Make ndbd_redo_log_reader be build default

  storage/ndb/src/common/debugger/EventLogger.cpp
    1.35 07/01/30 09:53:35 tomas@stripped +1 -1
    Change level on StartREDOLog to make it default come up in cluster log

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	tomas
# Host:	poseidon.mysql.com
# Root:	/home/tomas/mysql-5.1-telco

--- 1.34/storage/ndb/src/common/debugger/EventLogger.cpp	2007-01-24 12:20:34 +07:00
+++ 1.35/storage/ndb/src/common/debugger/EventLogger.cpp	2007-01-30 09:53:35 +07:00
@@ -886,7 +886,7 @@
   ROW(NDBStopCompleted,        LogLevel::llStartUp,     1, Logger::LL_INFO ),
   ROW(NDBStopForced,           LogLevel::llStartUp,     1, Logger::LL_ALERT ),
   ROW(NDBStopAborted,          LogLevel::llStartUp,     1, Logger::LL_INFO ),
-  ROW(StartREDOLog,            LogLevel::llStartUp,    10, Logger::LL_INFO ),
+  ROW(StartREDOLog,            LogLevel::llStartUp,     4, Logger::LL_INFO ),
   ROW(StartLog,                LogLevel::llStartUp,    10, Logger::LL_INFO ),
   ROW(UNDORecordsExecuted,     LogLevel::llStartUp,    15, Logger::LL_INFO ),
   ROW(StartReport,             LogLevel::llStartUp,     4, Logger::LL_INFO ),

--- 1.8/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp	2006-12-24 02:20:16 +07:00
+++ 1.9/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/records.hpp	2007-01-30 09:53:36 +07:00
@@ -135,7 +135,7 @@
   Uint32 getLogRecordSize();
   bool lastPage();
   Uint32 lastWord();
-protected:
+//protected:
   Uint32 m_checksum;
   Uint32 m_lap;
   Uint32 m_max_gci_completed;

--- 1.9/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp	2006-12-24 02:20:16 +07:00
+++ 1.10/storage/ndb/src/kernel/blocks/dblqh/redoLogReader/redoLogFileReader.cpp	2007-01-30 09:53:36 +07:00
@@ -46,7 +46,7 @@
 bool onlyPageHeaders = false;
 bool onlyMbyteHeaders = false;
 bool onlyFileDesc = false;
-bool firstLap = true;
+bool onlyLap = false;
 Uint32 startAtMbyte = 0;
 Uint32 startAtPage = 0;
 Uint32 startAtPageIndex = 0;
@@ -88,24 +88,34 @@
   bool lastPage = false;
   for (Uint32 j = startAtMbyte; j < NO_MBYTE_IN_FILE && !lastPage; j++) {
 
+    ndbout_c("mb: %d", j);
     readFromFile(f, redoLogPage, PAGESIZE*NO_PAGES_IN_MBYTE);
 
     words_from_previous_page = 0;
 
     // Loop for every page.
-    for (int i = 0; i < NO_PAGES_IN_MBYTE; i++) {
+    for (int i = 0; i < NO_PAGES_IN_MBYTE; i++) 
+    {
       wordIndex = 0;
       thePageHeader = (PageHeader *) &redoLogPage[i*PAGESIZE];
       // Print out mbyte number, page number and page index.
       ndbout << j << ":" << i << ":" << wordIndex << endl 
 	     << " " << j*32 + i << ":" << wordIndex << " ";
       if (thePrintFlag) ndbout << (*thePageHeader);
+      if (onlyLap)
+      {
+	ndbout_c("lap: %d maxgcicompleted: %d maxgcistarted: %d",
+		 thePageHeader->m_lap,
+		 thePageHeader->m_max_gci_completed,
+		 thePageHeader->m_max_gci_started);
+	continue;
+      }
       if (theCheckFlag) {
 	if(!thePageHeader->check()) {
 	  ndbout << "Error in thePageHeader->check()" << endl;
 	  doExit();
 	}
-
+	
 	Uint32 checkSum = 37;
 	for (int ps = 1; ps < PAGESIZE; ps++)
 	  checkSum = redoLogPage[i*PAGESIZE+ps] ^ checkSum;
@@ -287,7 +297,7 @@
       } while(wordIndex < lastWord && i < NO_PAGES_IN_MBYTE);
 
 
-      if (lastPage)
+      if (false && lastPage)
       {
 	if (theDumpFlag)
 	{
@@ -373,6 +383,9 @@
 	onlyPageHeaders = true;
       } else if (strcmp(argv[i], "-filedescriptors") == 0) {
 	onlyFileDesc = true;
+      } else if (strcmp(argv[i], "-lap") == 0) {
+	thePrintFlag = false;
+	onlyLap = true;
       } else if (strcmp(argv[i], "-mbyte") == 0) {
 	startAtMbyte = atoi(argv[i+1]);
 	if (startAtMbyte > 15) {

--- 1.9/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2006-12-31 07:30:44 +07:00
+++ 1.10/storage/ndb/src/kernel/blocks/dblqh/Makefile.am	2007-01-30 09:53:36 +07:00
@@ -13,7 +13,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-EXTRA_PROGRAMS = ndbd_redo_log_reader
+bin_PROGRAMS = ndbd_redo_log_reader
 
 ndbd_redo_log_reader_SOURCES = redoLogReader/records.cpp \
   redoLogReader/redoLogFileReader.cpp