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

[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-06-01 11:23:01-04:00, jas@rowvwade. +1 -0
  Keep shared lock on deferred index object during scan.

  storage/falcon/DeferredIndex.cpp@stripped, 2007-06-01 11:22:54-04:00, jas@rowvwade. +7 -1
    Keep shared lock on deferred index object during scan.

# 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.22/storage/falcon/DeferredIndex.cpp	2007-06-01 11:23:19 -04:00
+++ 1.23/storage/falcon/DeferredIndex.cpp	2007-06-01 11:23:19 -04:00
@@ -696,15 +696,21 @@
 
 void DeferredIndex::scanIndex(IndexKey *lowKey, IndexKey *highKey, int searchFlags, Bitmap *bitmap)
 {
+	Sync sync(&syncObject, "DeferredIndex::scanIndex");
+	sync.lock(Shared);
+	
 	// First, be sure it has not already been put into the serial log.
 
 	if (virtualOffset && !count)
 		{
-		Sync sync(&syncObject, "DeferredIndex::scanIndex");
+		sync.unlock();
 		sync.lock(Exclusive);
 
 		if (virtualOffset && !count)
 			transaction->thaw(this);
+		
+		sync.unlock();
+		sync.lock(Shared);
 		}
 
 	DeferredIndexWalker walker(this, lowKey, searchFlags);