bk commit into 5.0 tree (istruewing:1.2416)

[ingo]

Below is the list of changes that have just been committed into a local
5.0 repository of istruewing. When istruewing 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-02-20 10:01:54+01:00, istruewing@stripped +1 -0
  Fixed a bad merge. Got a duplicate symbol on OSX.

  mysys/my_thr_init.c@stripped, 2007-02-20 10:01:52+01:00, istruewing@stripped +0 -2
    Fixed a bad merge. Got a duplicate symbol on OSX.

# 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:	istruewing
# Host:	chilla.local
# Root:	/home/mydev/mysql-5.0-axmrg

--- 1.39/mysys/my_thr_init.c	2007-02-20 10:02:00 +01:00
+++ 1.40/mysys/my_thr_init.c	2007-02-20 10:02:00 +01:00
@@ -47,8 +47,6 @@ pthread_mutexattr_t my_fast_mutexattr;
 pthread_mutexattr_t my_errorcheck_mutexattr;
 #endif
 
-uint thd_lib_detected;
-
 #ifdef NPTL_PTHREAD_EXIT_BUG /* see my_pthread.h */
 
 /*