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

[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 16:01:21-04:00, jas@rowvwade. +3 -0
  Work in progress on Win64 port.  A lot of trial and
  error.

  storage/falcon/CMakeLists.txt@stripped, 2007-06-01 16:01:12-04:00, jas@rowvwade. +2 -0
    Reinstated SyncWait as a project class (used in JVM thread
    interface).

  storage/falcon/Interlock.h@stripped, 2007-06-01 16:01:13-04:00, jas@rowvwade. +8 -2
    Work in progress on Win64 port.

  storage/falcon/SerialLog.cpp@stripped, 2007-06-01 16:01:13-04:00, jas@rowvwade. +0 -4
    Work in progress on Win64 port.

# 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.47/storage/falcon/CMakeLists.txt	2007-06-01 16:01:39 -04:00
+++ 1.48/storage/falcon/CMakeLists.txt	2007-06-01 16:01:39 -04:00
@@ -259,6 +259,7 @@
 		StreamSegment.cpp 
 		SymbolManager.cpp 
 		Sync.cpp 
+		SyncWait.cpp 
 		Synchronize.cpp
 		SyncObject.cpp 
 		SyncWait.cpp 
@@ -520,6 +521,7 @@
 		StreamSegment.h 
 		SymbolManager.h 
 		Sync.h 
+		SyncWait.h 
 		Synchronize.h
 		SyncObject.h 
 		SyncWait.h 

--- 1.7/storage/falcon/Interlock.h	2007-06-01 16:01:39 -04:00
+++ 1.8/storage/falcon/Interlock.h	2007-06-01 16:01:39 -04:00
@@ -23,8 +23,14 @@
 
 #define COMPARE_EXCHANGE(target,compare,exchange)\
 	(InterlockedCompareExchange(target,exchange,compare)==compare)
+
+#ifdef _WIN64
+#define COMPARE_EXCHANGE_POINTER(target,compare,exchange)\
+	(InterlockedCompareExchangePointer((void *volatile*) target,(void*)exchange,(void*)compare)==(void*)compare)
+#else
 #define COMPARE_EXCHANGE_POINTER(target,compare,exchange)\
-	(_InterlockedCompareExchangePointer((volatile void**) target,(void*)exchange,(void*)compare)==(void*)compare)
+	(InterlockedCompareExchange((volatile int*) target,(int)exchange,(int)compare)==(int)compare)
+#endif
 
 #define InterlockedIncrement				_InterlockedIncrement
 #define InterlockedDecrement				_InterlockedDecrement
@@ -40,7 +46,7 @@
 	long  InterlockedIncrement(long* lpAddend);
 	long  InterlockedDecrement(long* lpAddend);
 	long  InterlockedCompareExchange(volatile int *Destination, int Exchange, int Comperand);
-	void* _InterlockedCompareExchangePointer(volatile void **Destination, void *Exchange, void *Comperand);
+	//void* InterlockedCompareExchangePointer(void *volatile*, void *Destination, void *Exchange, void *Comperand);
 	}
 
 #pragma intrinsic(_InterlockedIncrement)

--- 1.75/storage/falcon/SerialLog.cpp	2007-06-01 16:01:39 -04:00
+++ 1.76/storage/falcon/SerialLog.cpp	2007-06-01 16:01:39 -04:00
@@ -1213,17 +1213,13 @@
 	sync.lock(Shared);
 	int count = 0;
 	uint64 minBlockNumber = writeBlock->blockNumber;
-	SerialLogWindow *minWindow = writeWindow;
 		
 	for (SerialLogTransaction *action = inactions.first; action; action = action->next)
 		{
 		++count;
 		
 		if (action->minBlockNumber < minBlockNumber)
-			{
 			minBlockNumber = action->minBlockNumber;
-			minWindow = action->window;
-			}
 		}
 	
 	int64 delta = writeBlock->blockNumber - minBlockNumber;