bk commit into 6.0 tree (cpowers:1.2786) BUG#33634

[cpowers]

Below is the list of changes that have just been committed into a local
6.0 repository of cpowers. When cpowers 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-01-29 23:33:38-06:00, cpowers@stripped +1 -0
  Bug#33634, Falcon queries starved for a long time
  - Repositioned the shared lock in StorageHandler::getStorageConnection. 

  storage/falcon/StorageHandler.cpp@stripped, 2008-01-29 23:33:36-06:00, cpowers@stripped +2 -1
    Protect getStorageConnection() search with shared lock.

diff -Nrup a/storage/falcon/StorageHandler.cpp b/storage/falcon/StorageHandler.cpp
--- a/storage/falcon/StorageHandler.cpp	2008-01-26 16:52:21 -06:00
+++ b/storage/falcon/StorageHandler.cpp	2008-01-29 23:33:36 -06:00
@@ -651,6 +651,8 @@ StorageConnection* StorageHandler::getSt
 	
 	if (connections[slot])
 		{
+		sync.lock(Shared);
+
 		for (storageConnection = connections[slot]; storageConnection; storageConnection = storageConnection->collision)
 			if (storageConnection->mySqlThread == mySqlThread) // && storageConnection->storageDatabase == tableShare->storageDatabase)
 				{
@@ -662,7 +664,6 @@ StorageConnection* StorageHandler::getSt
 				return storageConnection;
 				}
 
-		sync.lock(Shared);
 		sync.unlock();
 		}