bk commit into 6.0 tree (klewis:1.2644)

[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-04-24 23:42:31-05:00, klewis@klewis-mysql. +3 -0
  Cleanup from code reviews.

  storage/falcon/RecordVersion.cpp@stripped, 2008-04-24 23:42:09-05:00, klewis@klewis-mysql. +2 -2
    Cleanup

  storage/falcon/Table.cpp@stripped, 2008-04-24 23:42:14-05:00, klewis@klewis-mysql. +6 -4
    Cleanup from code review.  This assert is needed.

  storage/falcon/Transaction.cpp@stripped, 2008-04-24 23:42:17-05:00, klewis@klewis-mysql. +1 -1
    Cleanup

diff -Nrup a/storage/falcon/RecordVersion.cpp b/storage/falcon/RecordVersion.cpp
--- a/storage/falcon/RecordVersion.cpp	2008-04-24 23:25:06 -05:00
+++ b/storage/falcon/RecordVersion.cpp	2008-04-24 23:42:09 -05:00
@@ -121,8 +121,8 @@ Record* RecordVersion::releaseNonRecursi
 Record* RecordVersion::fetchVersion(Transaction * trans)
 {
 	Sync syncPrior(format->table->getSyncPrior(this), "RecordVersion::fetchVersion");
-    if (priorVersion)
-        syncPrior.lock(Shared);
+	if (priorVersion)
+		syncPrior.lock(Shared);
 
 	return fetchVersionRecursive(trans);
 }
diff -Nrup a/storage/falcon/Table.cpp b/storage/falcon/Table.cpp
--- a/storage/falcon/Table.cpp	2008-04-23 16:03:42 -05:00
+++ b/storage/falcon/Table.cpp	2008-04-24 23:42:14 -05:00
@@ -981,10 +981,12 @@ void Table::rollbackRecord(RecordVersion
 		{
 		if (priorRecord == NULL && priorState == recDeleted)
 			return;
-			
-		recordToRollback->printRecord("Table::rollbackRecord");
-		insert(priorRecord, recordToRollback, recordToRollback->recordNumber);
-		//ASSERT(false);
+
+		// The store of this record into the record leaf failed. No way to recover.
+
+		recordToRollback->printRecord("Table::rollbackRecord failed");
+		//insert(priorRecord, recordToRollback, recordToRollback->recordNumber);
+		ASSERT(false);
 		}
 
 	if (!priorRecord && recordToRollback->recordNumber >= 0)
diff -Nrup a/storage/falcon/Transaction.cpp b/storage/falcon/Transaction.cpp
--- a/storage/falcon/Transaction.cpp	2008-04-24 22:52:47 -05:00
+++ b/storage/falcon/Transaction.cpp	2008-04-24 23:42:17 -05:00
@@ -84,7 +84,7 @@ Transaction::Transaction(Connection *cnc
 	syncObject.setName("Transaction::syncObject");
 	syncActive.setName("Transaction::syncActive");
 	syncIndexes.setName("Transaction::syncIndexes");
-	syncIndexes.setName("Transaction::syncSavepoints");
+	syncSavepoints.setName("Transaction::syncSavepoints");
 	firstRecord = NULL;
 	lastRecord = NULL;
 	dependencies = 0;