bk commit into 6.0 tree (hakank:1.2653)

[Hakan Kuecuekilmaz]

Below is the list of changes that have just been committed into a local
6.0 repository of hakan. When hakan 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-11-06 00:00:28+01:00, hakank@stripped +2 -0
  After review fixes.

  storage/falcon/Thread.cpp@stripped, 2007-11-06 00:00:23+01:00, hakank@stripped +1 -1
    Elminated superfluous casting.

  storage/falcon/Thread.h@stripped, 2007-11-06 00:00:23+01:00, hakank@stripped +1 -6
    Use already defined THREAD_ID macro.

diff -Nrup a/storage/falcon/Thread.cpp b/storage/falcon/Thread.cpp
--- a/storage/falcon/Thread.cpp	2007-11-05 20:49:01 +01:00
+++ b/storage/falcon/Thread.cpp	2007-11-06 00:00:23 +01:00
@@ -336,7 +336,7 @@ void Thread::createThread(void (*fn)(voi
 	pthread_attr_t attributes;
 	pthread_attr_init(&attributes);
 	pthread_attr_setdetachstate(&attributes, PTHREAD_CREATE_DETACHED);
-	int ret = pthread_create ((pthread_t *) &threadId, &attributes, thread, this);
+	int ret = pthread_create (&threadId, &attributes, thread, this);
 	pthread_attr_destroy(&attributes);
 	
 	if (ret)
diff -Nrup a/storage/falcon/Thread.h b/storage/falcon/Thread.h
--- a/storage/falcon/Thread.h	2007-11-05 20:49:01 +01:00
+++ b/storage/falcon/Thread.h	2007-11-06 00:00:23 +01:00
@@ -87,12 +87,7 @@ public:
 	void			*argument;
 	void			(* volatile function)(void*);
 	void*			threadHandle;
-
-#ifdef _WIN32
-	unsigned long	threadId;
-#else
-	pthread_t	threadId;
-#endif
+	THREAD_ID  		threadId;
 	Threads			*threadBarn;
 	Thread			*next;				// next thread in "thread barn"
 	Thread			*prior;				// next thread in "thread barn"