List:Commits« Previous MessageNext Message »
From:U-ROWVWADEjas Date:June 11 2007 3:23pm
Subject:bk commit into 6.0-falcon tree (jas:1.2565)
View as plain text  
Below is the list of changes that have just been committed into a local
6.0-falcon repository of . When  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@stripped, 2007-06-11 11:23:31-04:00, jas@rowvwade. +14 -0
  Report table space id on all serial log record diagnostic
  print methods.

  storage/falcon/PageInventoryPage.cpp@stripped, 2007-06-11 11:23:19-04:00, jas@rowvwade. +3 -3
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLBlobUpdate.cpp@stripped, 2007-06-11 11:23:20-04:00, jas@rowvwade. +2 -2
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLDataPage.cpp@stripped, 2007-06-11 11:23:20-04:00, jas@rowvwade. +2 -2
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLDelete.cpp@stripped, 2007-06-11 11:23:20-04:00, jas@rowvwade. +2 -2
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLDropTable.cpp@stripped, 2007-06-11 11:23:21-04:00, jas@rowvwade. +1 -1
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLFreePage.cpp@stripped, 2007-06-11 11:23:21-04:00, jas@rowvwade. +1 -1
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLIndexAdd.cpp@stripped, 2007-06-11 11:23:21-04:00, jas@rowvwade. +2 -2
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLIndexPage.cpp@stripped, 2007-06-11 11:23:22-04:00, jas@rowvwade. +1 -1
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLRecordLocator.cpp@stripped, 2007-06-11 11:23:22-04:00, jas@rowvwade. +2 -2
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLRecordStub.cpp@stripped, 2007-06-11 11:23:23-04:00, jas@rowvwade. +2 -2
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLSectionLine.cpp@stripped, 2007-06-11 11:23:23-04:00, jas@rowvwade. +1 -1
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLSectionPage.cpp@stripped, 2007-06-11 11:23:23-04:00, jas@rowvwade. +2 -2
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLSectionPromotion.cpp@stripped, 2007-06-11 11:23:24-04:00, jas@rowvwade. +2 -2
    Report table space id on all serial log record diagnostic
    print methods.

  storage/falcon/SRLSequencePage.cpp@stripped, 2007-06-11 11:23:24-04:00, jas@rowvwade. +1 -1
    Report table space id on all serial log record diagnostic
    print methods.

# 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:	jas
# Host:	rowvwade.
# Root:	D:/MySQL/mysql-5.1-falcon

--- 1.18/storage/falcon/SRLDataPage.cpp	2007-06-11 11:23:58 -04:00
+++ 1.19/storage/falcon/SRLDataPage.cpp	2007-06-11 11:23:58 -04:00
@@ -113,6 +113,6 @@
 
 void SRLDataPage::print()
 {
-	logPrint("Data Page %d, section %d, tblspc %d, locator page %d\n",
-			 pageNumber, sectionId, tableSpaceId, locatorPageNumber);
+	logPrint("Data Page %d/%d, section %d, locator page %d\n",
+			 pageNumber, tableSpaceId, sectionId, locatorPageNumber);
 }

--- 1.8/storage/falcon/SRLFreePage.cpp	2007-06-11 11:23:58 -04:00
+++ 1.9/storage/falcon/SRLFreePage.cpp	2007-06-11 11:23:58 -04:00
@@ -82,5 +82,5 @@
 
 void SRLFreePage::print()
 {
-	logPrint("Free Page %d\n", pageNumber);
+	logPrint("Free Page %d/%d\n", pageNumber, tableSpaceId);
 }

--- 1.12/storage/falcon/SRLIndexAdd.cpp	2007-06-11 11:23:58 -04:00
+++ 1.13/storage/falcon/SRLIndexAdd.cpp	2007-06-11 11:23:58 -04:00
@@ -92,6 +92,6 @@
 
 void SRLIndexAdd::print()
 {
-	logPrint("Index Add transaction %d, indexId %d, recordId %d, length %d\n", 
-			transactionId, indexId, recordId, length);
+	logPrint("Index Add transaction %d, indexId %d/%d, recordId %d, length %d\n", 
+			transactionId, indexId, tableSpaceId, recordId, length);
 }

--- 1.14/storage/falcon/SRLIndexPage.cpp	2007-06-11 11:23:58 -04:00
+++ 1.15/storage/falcon/SRLIndexPage.cpp	2007-06-11 11:23:58 -04:00
@@ -103,7 +103,7 @@
 
 void SRLIndexPage::print()
 {
-	logPrint("Index page %d, tblspc %d, level %d, parent %d, prior %d, next %d\n", pageNumber, tableSpaceId, level, parent, prior, next);
+	logPrint("Index page %d/%d, level %d, parent %d, prior %d, next %d\n", pageNumber, tableSpaceId, level, parent, prior, next);
 }
 
 void SRLIndexPage::redo()

--- 1.15/storage/falcon/SRLRecordLocator.cpp	2007-06-11 11:23:58 -04:00
+++ 1.16/storage/falcon/SRLRecordLocator.cpp	2007-06-11 11:23:58 -04:00
@@ -95,6 +95,6 @@
 
 void SRLRecordLocator::print()
 {
-	logPrint("RecordLocator sectionId %d, sequence %d, pageNumber %d\n",
-			sectionId, sequence, pageNumber);
+	logPrint("RecordLocator sectionId %d/%d, sequence %d, pageNumber %d\n",
+			sectionId, tableSpaceId, sequence, pageNumber);
 }

--- 1.7/storage/falcon/SRLSectionLine.cpp	2007-06-11 11:23:58 -04:00
+++ 1.8/storage/falcon/SRLSectionLine.cpp	2007-06-11 11:23:58 -04:00
@@ -74,5 +74,5 @@
 
 void SRLSectionLine::print(void)
 {
-	logPrint("Section Line: section index page %d, data page %d\n", pageNumber, dataPageNumber);
+	logPrint("Section Line: section index page %d/%d, data page %d\n", pageNumber, tableSpaceId, dataPageNumber);
 }

--- 1.13/storage/falcon/SRLSectionPage.cpp	2007-06-11 11:23:58 -04:00
+++ 1.14/storage/falcon/SRLSectionPage.cpp	2007-06-11 11:23:58 -04:00
@@ -92,6 +92,6 @@
 
 void SRLSectionPage::print()
 {
-	logPrint("Section Page parent %d, page %d, slot %d, sectionId %d, sequence %d, level %d\n",
-			parentPage, pageNumber, sectionSlot, sectionId, sequence, level);
+	logPrint("Section Page parent %d/%d, page %d, slot %d, sectionId %d, sequence %d, level %d\n",
+			parentPage, tableSpaceId, pageNumber, sectionSlot, sectionId, sequence, level);
 }

--- 1.7/storage/falcon/SRLSectionPromotion.cpp	2007-06-11 11:23:58 -04:00
+++ 1.8/storage/falcon/SRLSectionPromotion.cpp	2007-06-11 11:23:58 -04:00
@@ -81,6 +81,6 @@
 
 void SRLSectionPromotion::print(void)
 {
-	logPrint("Section Promotion: section %d, pageNumber, root page %d\n",
-			sectionId, pageNumber, rootPageNumber);
+	logPrint("Section Promotion: section %d/%d, pageNumber, root page %d\n",
+			sectionId, tableSpaceId, pageNumber, rootPageNumber);
 }

--- 1.6/storage/falcon/SRLSequencePage.cpp	2007-06-11 11:23:58 -04:00
+++ 1.7/storage/falcon/SRLSequencePage.cpp	2007-06-11 11:23:58 -04:00
@@ -72,5 +72,5 @@
 
 void SRLSequencePage::print(void)
 {
-	logPrint("Sequence Page: sequence %d, page %d\n", pageSequence, pageNumber);
+	logPrint("Sequence Page: sequence %d, page %d/%d\n", pageSequence, pageNumber, tableSpaceId);
 }

--- 1.14/storage/falcon/PageInventoryPage.cpp	2007-06-11 11:23:58 -04:00
+++ 1.15/storage/falcon/PageInventoryPage.cpp	2007-06-11 11:23:58 -04:00
@@ -100,7 +100,7 @@
 
 #ifdef STOP_PAGE
 							if (pageNumber == STOP_PAGE)
-								Log::debug("page %d allocated\n", pageNumber);
+								Log::debug("page %d/%d allocated\n", pageNumber, dbb->tableSpaceId);
 #endif
 
 #ifdef DEBUG_INDEX_PAGE
@@ -118,7 +118,7 @@
 {
 #ifdef STOP_PAGE
 	if (pageNumber == STOP_PAGE)
-		Log::debug("page %d released\n", pageNumber);
+		Log::debug("page %d/%d released\n", pageNumber, dbb->tableSpaceId);
 #endif
 
 	dbb->freePage (pageNumber);
@@ -361,7 +361,7 @@
 {
 #ifdef STOP_PAGE
 	if (pageNumber == STOP_PAGE)
-		Log::debug("page %d reallocated\n", pageNumber);
+		Log::debug("page %d/%d reallocated\n", pageNumber, dbb->tableSpaceId);
 #endif
 
 	int32 pip = pageNumber / dbb->pagesPerPip;

--- 1.9/storage/falcon/SRLBlobUpdate.cpp	2007-06-11 11:23:58 -04:00
+++ 1.10/storage/falcon/SRLBlobUpdate.cpp	2007-06-11 11:23:58 -04:00
@@ -53,8 +53,8 @@
 
 void SRLBlobUpdate::print()
 {
-	logPrint("Blob transaction %d, locator page %d/%d, blob page %d/%d\n",
-			transactionId, locatorPage, locatorLine, dataPage, dataLine);
+	logPrint("Blob transaction %d, locator page %d/%d, line %d, blob page %d/%d\n",
+			transactionId, locatorPage, tableSpaceId, locatorLine, dataPage, dataLine);
 }
 
 void SRLBlobUpdate::read()

--- 1.7/storage/falcon/SRLDelete.cpp	2007-06-11 11:23:58 -04:00
+++ 1.8/storage/falcon/SRLDelete.cpp	2007-06-11 11:23:58 -04:00
@@ -66,8 +66,8 @@
 
 void SRLDelete::print()
 {
-	logPrint("Delete: transaction %d, section %d, record %d\n",
-			transactionId, sectionId, recordId);
+	logPrint("Delete: transaction %d, section %d/%d, record %d\n",
+			transactionId, sectionId, tableSpaceId, recordId);
 }
 
 void SRLDelete::pass1()

--- 1.21/storage/falcon/SRLDropTable.cpp	2007-06-11 11:23:58 -04:00
+++ 1.22/storage/falcon/SRLDropTable.cpp	2007-06-11 11:23:58 -04:00
@@ -88,7 +88,7 @@
 
 void SRLDropTable::print()
 {
-	logPrint("Drop Section %d\n", sectionId);
+	logPrint("Drop Section %d/%d\n", sectionId, tableSpaceId);
 }
 
 void SRLDropTable::commit(void)

--- 1.10/storage/falcon/SRLRecordStub.cpp	2007-06-11 11:23:58 -04:00
+++ 1.11/storage/falcon/SRLRecordStub.cpp	2007-06-11 11:23:58 -04:00
@@ -63,8 +63,8 @@
 
 void SRLRecordStub::print()
 {
-	logPrint("Record stub: transaction %d, section %d, record %d\n",
-			transactionId, sectionId, recordId);
+	logPrint("Record stub: transaction %d, section %d/%d, record %d\n",
+			transactionId, sectionId, tableSpaceId, recordId);
 }
 
 void SRLRecordStub::pass1()
Thread
bk commit into 6.0-falcon tree (jas:1.2565)U-ROWVWADEjas11 Jun