bk commit into 5.1-falcon tree (jas:1.2620)

[U-ROWVWADEjas]

Below is the list of changes that have just been committed into a local
5.1-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-04-19 12:26:15-04:00, jas@rowvwade. +1 -0
  Get proper record and reference counts for 
  StorageDatabase::deleteRow for "innodb compatibility
  mode."  This is a fix for Falcon but 22150.

  storage/falcon/StorageDatabase.cpp@stripped, 2007-04-19 12:26:07-04:00, jas@rowvwade. +11 -3
    Get proper record and reference counts for 
    StorageDatabase::deleteRow for "innodb compatibility
    mode."

# 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.65/storage/falcon/StorageDatabase.cpp	2007-04-19 12:26:34 -04:00
+++ 1.66/storage/falcon/StorageDatabase.cpp	2007-04-19 12:26:34 -04:00
@@ -548,7 +548,8 @@
 int StorageDatabase::deleteRow(StorageConnection *storageConnection, Table* table, int
recordNumber)
 {
 	Connection *connection = storageConnection->connection;
-
+	Transaction *transaction = connection->transaction;
+	
 	try
 		{
 		Record *candidate = table->fetch(recordNumber);
@@ -556,7 +557,14 @@
 		if (!candidate)
 			return StorageErrorRecordNotFound;
 		
-		Record *record = candidate->fetchVersion(connection->getTransaction());
+		Record *record;
+		
+		if (candidate->state == recLock)
+			record = candidate->getPriorVersion();
+		else if (candidate->getTransaction() == transaction)
+			record = candidate;
+		else
+			record = candidate->fetchVersion(transaction);
 
 		if (record != candidate)
 			{
@@ -564,7 +572,7 @@
 			candidate->release();
 			}
 		
-		table->deleteRecord(connection->getTransaction(), record);
+		table->deleteRecord(transaction, record);
 		record->release();
 		
 		return 0;