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

[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-07-23 12:22:14-04:00, jas@rowvwade. +3 -0
  Reordered object field updates around locks in 
  Transaction::commitNoUpdates in minimize any cache
  coherency issues on many processor SMP.  This
  shouldn't affect anything, but ...

  storage/falcon/Transaction.cpp@stripped, 2007-07-23 12:22:07-04:00, jas@rowvwade. +12 -12
    Reordered object field updates around locks in 
    Transaction::commitNoUpdates in minimize any cache
    coherency issues on many processor SMP.  This
    shouldn't affect anything, but ...

  storage/falcon/TransactionManager.cpp@stripped, 2007-07-23 12:22:08-04:00, jas@rowvwade. +1 -0
    Zap transaction state at shutdown time.

  storage/falcon/ha_falcon.cpp@stripped, 2007-07-23 12:22:08-04:00, jas@rowvwade. +1 -1
    Changed default "max_transactions_backlog" from 10K to 150
    for performance.

# 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.25/storage/falcon/TransactionManager.cpp	2007-07-23 12:22:34 -04:00
+++ 1.26/storage/falcon/TransactionManager.cpp	2007-07-23 12:22:34 -04:00
@@ -58,6 +58,7 @@
 	for (Transaction *transaction; (transaction = activeTransactions.first);)
 		{
 		transaction->inList = false;
+		transaction->state = Committed;
 		activeTransactions.first = transaction->next;
 		transaction->release();
 		}

--- 1.121/storage/falcon/Transaction.cpp	2007-07-23 12:22:34 -04:00
+++ 1.122/storage/falcon/Transaction.cpp	2007-07-23 12:22:34 -04:00
@@ -184,8 +184,11 @@
 
 	if (state == Active)
 		{
-		ASSERT(false);
-		syncActive.unlock();
+		//ASSERT(false);
+		Log::debug("Deleting apparently active transaction %d\n", transactionId);
+		
+		if (syncActive.ourExclusiveLock())
+			syncActive.unlock();
 		}
 
 	delete [] states;
@@ -308,19 +311,17 @@
 	TransactionManager *transactionManager = database->transactionManager;
 	addRef();
 	ASSERT(!deferredIndexes);
-	
 	++transactionManager->committed;
 	
 	if (hasLocks)
 		releaseRecordLocks();
 
-	releaseSavePoints();
 	Sync syncActiveTransactions(&transactionManager->activeTransactions.syncObject, "Transaction::commitNoUpdates");
 	syncActiveTransactions.lock(Shared);
 	releaseDependencies();
 	Thread *thread = NULL;
-	Sync sync(&transactionManager->syncInitialize, "Transaction::commitNoUpdate");
-	sync.lock(Shared);
+	Sync syncInit(&transactionManager->syncInitialize, "Transaction::commitNoUpdate");
+	syncInit.lock(Shared);
 	state = CommittingReadOnly;
 
 	for (int n = 0; dependencies && n < 10; ++n)
@@ -354,12 +355,7 @@
 
 	if (dependencies)
 		Log::debug("final dangling dependencies for transaction %d\n", transactionId);
-	
-	sync.unlock();
-	syncActiveTransactions.unlock();
-	state = Committed;
-	syncActive.unlock();
-	writePending = false;
+
 
 	delete [] xid;
 	xid = NULL;
@@ -373,6 +369,10 @@
 		transactionId = 0;
 		
 	state = Available;
+	writePending = false;
+	syncInit.unlock();
+	syncActiveTransactions.unlock();
+	syncActive.unlock();
 	release();
 }
 

--- 1.203/storage/falcon/ha_falcon.cpp	2007-07-23 12:22:34 -04:00
+++ 1.204/storage/falcon/ha_falcon.cpp	2007-07-23 12:22:34 -04:00
@@ -2839,7 +2839,7 @@
 static MYSQL_SYSVAR_UINT(max_transaction_backlog, falcon_max_transaction_backlog,
   PLUGIN_VAR_RQCMDARG,
   "Maximum number of backlogged transactions.",
-  NULL, NULL, 10000, 1, 1000000, 1);
+  NULL, NULL, 150, 1, 1000000, 1);
 
 static struct st_mysql_sys_var* falconVariables[]= {
 	MYSQL_SYSVAR(debug_server),