bk commit into 6.0 tree (jas:1.2668)

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@1.2668, 2007-10-31 13:10:46-04:00, jas@rowvwade. +1 -0   Work around deadlock between Database::updateCardinalities   and Database::renameTable.

  storage/falcon/Database.cpp@1.28, 2007-10-31 13:10:39-04:00, jas@rowvwade. +3 -6     Work around deadlock between Database::updateCardinalities     and Database::renameTable.

diff -Nrup a/storage/falcon/Database.cpp b/storage/falcon/Database.cpp
--- a/storage/falcon/Database.cpp	2007-10-31 13:05:10 -04:00
+++ b/storage/falcon/Database.cpp	2007-10-31 13:10:39 -04:00
@@ -2240,12 +2240,9 @@ void Database::updateCardinalities(void)
 			}
 		}
 	

-	if (hit)
-		{
-		sync.unlock();
-		syncSystemTransaction.unlock();
-		commitSystemTransaction();
-		}

+	sync.unlock();
+	syncSystemTransaction.unlock();
+	commitSystemTransaction();

 void Database::sync()

-- 
MySQL Code Commits Mailing List
For list archives: 
http://lists.mysql.com/commits
To unsubscribe:    
http://lists.mysql.com/commits?unsub=lists@pantek.com