bk commit into 6.0 tree (jas:1.2807)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
6.0 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, 2008-02-08 11:54:22-05:00, jas@rowvwade. +1 -0
  Handle insert backout in new record update validation
  mechanism.

  storage/falcon/Table.cpp@stripped, 2008-02-08 11:54:13-05:00, jas@rowvwade. +3 -1
    Handle insert backout in new record update validation
    mechanism.

diff -Nrup a/storage/falcon/Table.cpp b/storage/falcon/Table.cpp
--- a/storage/falcon/Table.cpp	2008-02-08 11:34:56 -05:00
+++ b/storage/falcon/Table.cpp	2008-02-08 11:54:13 -05:00
@@ -376,6 +376,7 @@ void Table::insert(Transaction *transact
 		if (recordNumber >= 0)
 			{
 			dbb->updateRecord(dataSection, recordNumber, NULL, transaction, false);
+			dataSection->expungeRecord(recordNumber);
 			record->recordNumber = -1;
 			}
 
@@ -2918,6 +2919,7 @@ uint Table::insert(Transaction *transact
 		if (recordNumber >= 0)
 			{
 			dbb->updateRecord(dataSection, recordNumber, NULL, transaction, false);
+			dataSection->expungeRecord(recordNumber);
 			record->recordNumber = -1;
 			}
 
@@ -3584,7 +3586,7 @@ bool Table::validateUpdate(int32 recordN
 		record = next;
 		}
 	
-	ASSERT(false);
+	return true;
 }
 
 void Table::expungeRecord(int32 recordNumber)