bk commit into 6.0 tree (antony:1.2771)

[antony]

Below is the list of changes that have just been committed into a local
6.0 repository of antony. When antony 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-12-22 02:27:31-08:00, antony@stripped +5 -0
  Fix build failures exposed by Pushbuild.

  storage/falcon/Engine.h@stripped, 2007-12-22 02:27:28-08:00, antony@stripped +2 -3
    INTERLOCK_TYPE always 'long' on Windows. Since Win64 is LLP64, 'long'
    values are still 4 byte integers.

  storage/falcon/Interlock.h@stripped, 2007-12-22 02:27:28-08:00, antony@stripped +1
-1
    fix typecast failure on Windows.

  storage/falcon/SerialLog.cpp@stripped, 2007-12-22 02:27:28-08:00, antony@stripped
+1 -1
    fix typecast failure on Windows.

  storage/falcon/Socket.h@stripped, 2007-12-22 02:27:29-08:00, antony@stripped +1 -0
    Fix powermacg5 build failure

  storage/falcon/SyncObject.h@stripped, 2007-12-22 02:27:29-08:00, antony@stripped +3
-1
    INTERLOCK_TYPE always 'long' on Windows. Since Win64 is LLP64, 'long'
    values are still 4 byte integers.

diff -Nrup a/storage/falcon/Engine.h b/storage/falcon/Engine.h
--- a/storage/falcon/Engine.h	2007-10-30 09:27:59 -07:00
+++ b/storage/falcon/Engine.h	2007-12-22 02:27:28 -08:00
@@ -91,10 +91,9 @@ typedef unsigned int	uint;
 typedef __int64				IPTR;
 typedef unsigned __int64	UIPTR;
 #define HAVE_IPTR
-#define INTERLOCK_TYPE		long
-#else
-#define INTERLOCK_TYPE		int
 #endif
+
+#define INTERLOCK_TYPE		long
 
 #else
 
diff -Nrup a/storage/falcon/Interlock.h b/storage/falcon/Interlock.h
--- a/storage/falcon/Interlock.h	2007-12-20 17:18:33 -08:00
+++ b/storage/falcon/Interlock.h	2007-12-22 02:27:28 -08:00
@@ -34,7 +34,7 @@
 void* _InterlockedCompareExchangePointer(void *volatile *Destination, void *Exchange,
void *Comperand);
 #else /* _WIN64 */
 #define COMPARE_EXCHANGE_POINTER(target,compare,exchange)\
-	(InterlockedCompareExchange((volatile int*)
target,(int)exchange,(int)compare)==(int)compare)
+	(InterlockedCompareExchange((volatile long*)
target,(long)exchange,(long)compare)==(long)compare)
 #endif /* _WIN64 */
 
 #define InterlockedIncrement				_InterlockedIncrement
diff -Nrup a/storage/falcon/SerialLog.cpp b/storage/falcon/SerialLog.cpp
--- a/storage/falcon/SerialLog.cpp	2007-12-19 15:26:16 -08:00
+++ b/storage/falcon/SerialLog.cpp	2007-12-22 02:27:28 -08:00
@@ -1483,7 +1483,7 @@ void SerialLog::updateSectionUseVector(u
 		info->sectionUseVector.extend(sectionId + 10);
 	
 	//info->sectionUseVector.vector[sectionId] += delta;
-	INTERLOCKED_ADD((volatile int *) (info->sectionUseVector.vector + sectionId), delta);
+	INTERLOCKED_ADD((volatile INTERLOCK_TYPE*)(info->sectionUseVector.vector +
sectionId), delta);
 }
 
 void SerialLog::updateIndexUseVector(uint indexId, int tableSpaceId, int delta)
diff -Nrup a/storage/falcon/Socket.h b/storage/falcon/Socket.h
--- a/storage/falcon/Socket.h	2007-09-20 08:42:37 -07:00
+++ b/storage/falcon/Socket.h	2007-12-22 02:27:29 -08:00
@@ -31,6 +31,7 @@
 #define socket_t	SOCKET
 #else
 #define socket_t	int
+#include <sys/types.h>
 #include <sys/socket.h>
 #include <netinet/in.h>
 #endif
diff -Nrup a/storage/falcon/SyncObject.h b/storage/falcon/SyncObject.h
--- a/storage/falcon/SyncObject.h	2007-10-26 12:55:31 -07:00
+++ b/storage/falcon/SyncObject.h	2007-12-22 02:27:29 -08:00
@@ -26,7 +26,9 @@
 
 #include "SynchronizationObject.h"
 
-#ifndef INTERLOCK_TYPE
+#if !defined(INTERLOCK_TYPE) && defined(_WIN32)
+#define INTERLOCK_TYPE	long
+#elif !defined(INTERLOCK_TYPE)
 #define INTERLOCK_TYPE	int
 #endif