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

[Vladislav Vaintroub]

#At file:///G:/bzr/mysql-6.0-falcon-team/

 2969 Vladislav Vaintroub	2009-01-12 [merge]
      merge
modified:
  mysql-test/include/restart_mysqld.inc
  storage/falcon/Database.cpp
  storage/falcon/Interlock.h
  storage/falcon/RecordScavenge.cpp
  storage/falcon/Table.cpp

=== modified file 'mysql-test/include/restart_mysqld.inc'
--- a/mysql-test/include/restart_mysqld.inc	2008-12-10 16:55:09 +0000
+++ b/mysql-test/include/restart_mysqld.inc	2009-01-10 17:59:21 +0000
@@ -9,9 +9,6 @@ EOF
 # it 30 seconds to die before zapping it.
 shutdown_server 30;
 
-# Check server is gone.
---source include/wait_until_disconnected.inc
-
 # Write file to make mysql-test-run.pl start up the server again.
 --append_file $MYSQLTEST_VARDIR/tmp/master0.expect
 restart

=== modified file 'storage/falcon/Database.cpp'
--- a/storage/falcon/Database.cpp	2009-01-09 21:49:16 +0000
+++ b/storage/falcon/Database.cpp	2009-01-10 16:00:02 +0000
@@ -1741,9 +1741,9 @@ void Database::scavenge()
 	
 	syncStmt.unlock();
 
-	// purgeTransactions will release records that are  attached to old 
-	// transactions, thus freeing up old invisible records to be pruned 
-	// and actually released.  It is not likely that the scavenger will 
+	// purgeTransactions will release records that are  attached to old 
+	// transactions, thus freeing up old invisible records to be pruned 
+	// and actually released.  It is not likely that the scavenger will 
 	// retire these freshly released base records, but disconnecting 
 	// pruneable records from their transactions is definitely needed.
 

=== modified file 'storage/falcon/Interlock.h'
--- a/storage/falcon/Interlock.h	2008-12-11 12:35:08 +0000
+++ b/storage/falcon/Interlock.h	2009-01-10 16:00:02 +0000
@@ -52,9 +52,9 @@
 /* Visual Studio 2003 and earlier do not have prototypes for atomic intrinsics */
 extern "C" 
 	{
-	long _InterlockedIncrement(long volatile *Addend);
+	long _InterlockedIncrement(long volatile *Addend);
 	long _InterlockedDecrement(long volatile *Addend);
-	long _InterlockedExchangeAdd(long volatile *Addend, long Value);
+	long _InterlockedExchangeAdd(long volatile *Addend, long Value);
 	long _InterlockedExchange(long volatile *Target,long Value);
 	long _InterlockedCompareExchange (long volatile *Target, long Value, long Comp);
 	}

=== modified file 'storage/falcon/RecordScavenge.cpp'
--- a/storage/falcon/RecordScavenge.cpp	2009-01-08 15:09:05 +0000
+++ b/storage/falcon/RecordScavenge.cpp	2009-01-10 16:03:04 +0000
@@ -197,7 +197,7 @@ Record* RecordScavenge::inventoryRecord(
 				ageGroups[0] += size;
 			else if (age < 1)
 				ageGroups[0] += size;
-			else if (age < AGE_GROUPS)
+			else if (age < (int64) AGE_GROUPS)
 				ageGroups[age] += size;
 			else	// age >= AGE_GROUPS
 				{

=== modified file 'storage/falcon/Table.cpp'
--- a/storage/falcon/Table.cpp	2009-01-09 22:27:50 +0000
+++ b/storage/falcon/Table.cpp	2009-01-10 16:00:02 +0000
@@ -528,22 +528,25 @@ Record* Table::fetchNext(int32 start)
 				// Don't bother with a record that is half-way inserted.
 
 				if (record->state == recInserting)
+					{
+					recordNumber = bitNumber + 1;
 					continue;
+					}
 
 				break;
 				}
 
 			if (backloggedRecords && (record = backlogFetch(bitNumber)))
 				break;
-				
+
 			sync.unlock();
-			
+
 			for (int n = 0; (record = databaseFetch(bitNumber)); ++n)
 				{
 				if (insert(record, NULL, bitNumber))
 					{
 					record->poke();
-					
+
 					return record;
 					}