bk commit into 6.0-falcon tree (jas:1.2522)

[U-ROWVWADEjas]

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-05-29 14:12:57-04:00, jas@rowvwade. +1 -0
  Cleaned up page printing to avoid logging deadlock and
  provide appropriate per-page type information.

  storage/falcon/Dbb.cpp@stripped, 2007-05-29 14:12:50-04:00, jas@rowvwade. +26 -5
    Cleaned up page printing to avoid logging deadlock and
    provide appropriate per-page type information.

# 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.62/storage/falcon/Dbb.cpp	2007-05-29 14:13:16 -04:00
+++ 1.63/storage/falcon/Dbb.cpp	2007-05-29 14:13:16 -04:00
@@ -980,7 +980,11 @@
 			break;
 
 		case PAGE_sections:		// 2
-			Log::debug ("Page %d is sections page\n", pageNumber);
+			{
+			SectionPage *sectionPage = (SectionPage*) page;
+			Log::debug ("Page %d is sections page section %d, level %d, seq %d\n", 
+						pageNumber, sectionPage->section, sectionPage->level, sectionPage->sequence);
+			}
 			break;
 
 		/***
@@ -990,16 +994,28 @@
 		***/
 		
 		case PAGE_record_locator:	// 4
-			Log::debug ("Page %d is record locator page\n", pageNumber);
+			{
+			RecordLocatorPage *recordLocator = (RecordLocatorPage*) page;
+			Log::debug ("Page %d is record locator page, section %d, seq %d\n", 
+						 pageNumber, recordLocator->section, recordLocator->sequence);
+			}
 			break;
 
 		case PAGE_btree:			// 5
 		//case PAGE_btree_leaf:	// 6
-			IndexPage::printPage (bdb, false);
+			//IndexPage::printPage (bdb, false);
+			{
+			IndexPage *indexPage = (IndexPage*) page;
+			Log::debug ("Page %d is index page, parent %d, prior %d, next %d, lvl %d\n", 
+						 pageNumber, indexPage->parentPage, indexPage->priorPage, indexPage->nextPage, indexPage->level);
+			}
 			break;
 
-		case PAGE_data:			// 7
+		case PAGE_data:	
+			{		// 7
+			//DataPage *dataPage = (DataPage*) page;
 			Log::debug ("Page %d is data page\n", pageNumber);
+			}
 			break;
 
 		case PAGE_inventory:		// 8
@@ -1011,7 +1027,12 @@
 			break;
 
 		case PAGE_inversion:		// 10
-			((InversionPage*) bdb)->printPage (bdb);
+			//((InversionPage*) bdb)->printPage (bdb);
+			{
+			InversionPage *indexPage = (InversionPage*) page;
+			Log::debug ("Page %d is index page, parent %d, prior %d, next %d\n", 
+						 pageNumber, indexPage->parentPage, indexPage->priorPage, indexPage->nextPage);
+			}
 			break;
 
 		case PAGE_free:			// 11 Page has been released