bk commit into 6.0 tree (klewis:1.2674) BUG#36603

[klewis]

Below is the list of changes that have just been committed into a local
6.0 repository of klewis.  When klewis 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, 2008-05-08 15:30:19-05:00, klewis@klewis-mysql. +8 -0
  Bug#36603 - Adjust age group values to uint32

  storage/falcon/BDB.h@stripped, 2008-05-08 15:29:44-05:00, klewis@klewis-mysql. +1 -1
    Bug#36603 - Adjust age group values to uint32

  storage/falcon/Cache.h@stripped, 2008-05-08 15:29:48-05:00, klewis@klewis-mysql. +1 -1
    Bug#36603 - Adjust age group values to uint32

  storage/falcon/Record.cpp@stripped, 2008-05-08 15:29:51-05:00, klewis@klewis-mysql. +1 -1
    Bug#36603 - Adjust age group values to uint32

  storage/falcon/Record.h@stripped, 2008-05-08 15:29:53-05:00, klewis@klewis-mysql. +1 -1
    Bug#36603 - Adjust age group values to uint32

  storage/falcon/RecordLeaf.cpp@stripped, 2008-05-08 15:29:56-05:00, klewis@klewis-mysql. +1
-1
    Cleanup

  storage/falcon/RecordScavenge.cpp@stripped, 2008-05-08 15:30:02-05:00, klewis@klewis-mysql.
+1 -1
    Bug#36603 - Adjust age group values to uint32

  storage/falcon/RecordScavenge.h@stripped, 2008-05-08 15:30:05-05:00, klewis@klewis-mysql. +2
-2
    Bug#36603 - Adjust age group values to uint32

  storage/falcon/Table.cpp@stripped, 2008-05-08 15:30:07-05:00, klewis@klewis-mysql. +2 -2
    Cleanup

diff -Nrup a/storage/falcon/BDB.h b/storage/falcon/BDB.h
--- a/storage/falcon/BDB.h	2008-03-27 01:08:51 -05:00
+++ b/storage/falcon/BDB.h	2008-05-08 15:29:44 -05:00
@@ -91,7 +91,7 @@ public:
 	Dbb				*dbb;
 	int32			pageNumber;
 	TransId			transactionId;
-	int				age;
+	uint64			age;
 	Page			*buffer;
 	Bdb				*prior;		/* position in LRU que */
 	Bdb				*next;
diff -Nrup a/storage/falcon/Cache.h b/storage/falcon/Cache.h
--- a/storage/falcon/Cache.h	2008-03-27 01:08:57 -05:00
+++ b/storage/falcon/Cache.h	2008-05-08 15:29:48 -05:00
@@ -108,7 +108,7 @@ protected:
 	int			numberHunks;
 	int			numberDirtyPages;
 	int			numberIoThreads;
-	volatile int bufferAge;
+	volatile uint64 bufferAge;
 public:
 	void flushWait(void);
 };
diff -Nrup a/storage/falcon/Record.cpp b/storage/falcon/Record.cpp
--- a/storage/falcon/Record.cpp	2008-04-30 08:54:53 -05:00
+++ b/storage/falcon/Record.cpp	2008-05-08 15:29:51 -05:00
@@ -825,7 +825,7 @@ bool Record::isNull(int fieldId)
 
 void Record::poke()
 {
-	int gen = format->table->database->currentGeneration;
+	uint64 gen = format->table->database->currentGeneration;
 	
 	if (generation != gen)
 		generation = gen;
diff -Nrup a/storage/falcon/Record.h b/storage/falcon/Record.h
--- a/storage/falcon/Record.h	2008-04-21 21:11:26 -05:00
+++ b/storage/falcon/Record.h	2008-05-08 15:29:53 -05:00
@@ -146,7 +146,7 @@ public:
 	Format		*format;
 	int			recordNumber;
 	int			size;
-	int			generation;
+	uint64		generation;
 	short		highWater;
 	UCHAR		encoding;
 	UCHAR		state;
diff -Nrup a/storage/falcon/RecordLeaf.cpp b/storage/falcon/RecordLeaf.cpp
--- a/storage/falcon/RecordLeaf.cpp	2008-04-09 09:51:51 -05:00
+++ b/storage/falcon/RecordLeaf.cpp	2008-05-08 15:29:56 -05:00
@@ -138,7 +138,7 @@ int RecordLeaf::retireRecords (Table *ta
 				syncPrior.lock(Shared);
 	
 				if (record->scavenge(recordScavenge, Shared))
-				    break;
+					break;
 				else
 					++count;
 				}
diff -Nrup a/storage/falcon/RecordScavenge.cpp b/storage/falcon/RecordScavenge.cpp
--- a/storage/falcon/RecordScavenge.cpp	2008-04-26 22:13:21 -05:00
+++ b/storage/falcon/RecordScavenge.cpp	2008-05-08 15:30:02 -05:00
@@ -53,7 +53,7 @@ void RecordScavenge::inventoryRecord(Rec
 		{
 		++numberRecords;
 		recordSpace += record->size;
-		int age = baseGeneration - record->generation;
+		uint64 age = baseGeneration - record->generation;
 		int size = record->size + sizeof(MemBigHeader);
 		
 		if (record->hasRecord() || (record->state == recChilled))
diff -Nrup a/storage/falcon/RecordScavenge.h b/storage/falcon/RecordScavenge.h
--- a/storage/falcon/RecordScavenge.h	2008-04-26 22:13:21 -05:00
+++ b/storage/falcon/RecordScavenge.h	2008-05-08 15:30:05 -05:00
@@ -27,8 +27,8 @@ class RecordScavenge
 public:
 	Database	*database;
 	TransId		transactionId;
-	int			scavengeGeneration;
-	int			baseGeneration;
+	uint64		scavengeGeneration;
+	uint64		baseGeneration;
 	uint		recordsReclaimed;
 	uint		recordsRemaining;
 	uint		numberRecords;
diff -Nrup a/storage/falcon/Table.cpp b/storage/falcon/Table.cpp
--- a/storage/falcon/Table.cpp	2008-05-02 00:17:46 -05:00
+++ b/storage/falcon/Table.cpp	2008-05-08 15:30:07 -05:00
@@ -1449,7 +1449,7 @@ void Table::deleteRecord(Transaction * t
 	database->preUpdate();
 	Sync scavenge(&syncScavenge, "Table::deleteRecord");
 
-    // syncPrior is not needed here.  It is handled in fetchVersion()
+	// syncPrior is not needed here.  It is handled in fetchVersion()
 	Record *candidate = fetch(orgRecord->recordNumber);
 	checkAncestor(candidate, orgRecord);
 	RecordVersion *record;
@@ -3448,7 +3448,7 @@ Record* Table::fetchForUpdate(Transactio
 		if (record->state != recLock)
 			return record;
 
-		Sync syncPrior(getSyncPrior(record), "Table::fetchForUpdate(1)");
+		Sync syncPrior(getSyncPrior(record), "Table::fetchForUpdate");
 		syncPrior.lock(Shared);
 	
 		Record *prior = record->getPriorVersion();