bzr commit into mysql-6.0-falcon-team branch (vvaintroub:3028)

[Vladislav Vaintroub]

#At file:///G:/bzr/ts2/ based on revid:vvaintroub@stripped

 3028 Vladislav Vaintroub	2009-02-19
      Disable scheduled scavenges and updateCardinalities during recovery (recovery does not like to be disturbed by parallel activities).
      
      Forced scavenges are not disabled,  but they should not be triggered (info from Kevin)
      modified:
        storage/falcon/Database.cpp

=== modified file 'storage/falcon/Database.cpp'
--- a/storage/falcon/Database.cpp	2009-02-18 17:41:40 +0000
+++ b/storage/falcon/Database.cpp	2009-02-19 00:23:00 +0000
@@ -1733,10 +1733,14 @@ void Database::scavenge(bool forced)
 {
 	// Signal the cardinality task unless a forced scavenge is pending
 
-	if (!forced &&
-		++scavengeCount % CARDINALITY_FREQUENCY == 0)
+	if (!forced)
 		{
-		signalCardinality();
+		// Don't disturb recovery
+		if (serialLog && serialLog->recovering)
+			return;
+
+		if (++scavengeCount % CARDINALITY_FREQUENCY == 0)
+			signalCardinality();
 		}
 	
 	scavengeForced = 0;