bk commit into 5.1 tree (georg:1.2342)

[georg]

Below is the list of changes that have just been committed into a local
5.1 repository of georg. When georg 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, 2006-10-05 16:04:46+02:00, georg@stripped +2 -0
  ICC compiler fix.
  Fixed error constant

  include/config-win.h@stripped, 2006-10-05 16:04:40+02:00, georg@stripped +6 -0
    Fix/Workaround for ICC (Intel) bug on Win64, to prevent preprocessor error in 
    log_event.h

  include/my_pthread.h@stripped, 2006-10-05 16:04:40+02:00, georg@stripped +1 -1
    use error constants instead of numbers to avoid 32/64-bit conflicts

# 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:	georg
# Host:	lmy002.wdf.sap.corp
# Root:	/home/georg/work/mysql/prod/mysql-5.1-win

--- 1.91/include/config-win.h	2006-10-05 16:05:01 +02:00
+++ 1.92/include/config-win.h	2006-10-05 16:05:01 +02:00
@@ -116,8 +116,14 @@
 #define ULL(A)          ((unsigned __int64) A)
 #endif
 
+/* special fix for ICC Win64 compiler bug in log_event.h */
+#if defined(__INTEL_COMPILER) && (defined(_WIN64) || defined(WIN64))
+#define LONGLONG_MIN	(__int64)(0x8000000000000000)
+#define LONGLONG_MAX	(__int64)(0x7FFFFFFFFFFFFFFF)
+#else
 #define LONGLONG_MIN	LL(0x8000000000000000)
 #define LONGLONG_MAX	LL(0x7FFFFFFFFFFFFFFF)
+#endif
 #define ULONGLONG_MAX	ULL(0xFFFFFFFFFFFFFFFF)
 
 /* Type information */

--- 1.96/include/my_pthread.h	2006-10-05 16:05:01 +02:00
+++ 1.97/include/my_pthread.h	2006-10-05 16:05:01 +02:00
@@ -103,7 +103,7 @@
 #ifdef USE_TLS					/* For LIBMYSQL.DLL */
 #undef SAFE_MUTEX				/* This will cause conflicts */
 #define pthread_key(T,V)  DWORD V
-#define pthread_key_create(A,B) ((*A=TlsAlloc())==0xFFFFFFFF)
+#define pthread_key_create(A,B) ((*A=TlsAlloc())==TLS_OUT_OF_INDEXES)
 #define pthread_key_delete(A) TlsFree(A)
 #define pthread_getspecific(A) (TlsGetValue(A))
 #define my_pthread_getspecific(T,A) ((T) TlsGetValue(A))