bk commit into 5.1 tree (istruewing:1.2532)

[ingo]

Below is the list of changes that have just been committed into a local
5.1 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-03-30 09:14:11+02:00, istruewing@stripped +2 -0
  Post merge fix

  mysys/my_pthread.c@stripped, 2007-03-30 09:14:07+02:00, istruewing@stripped +0 -2
    Post merge fix

  sql/mysqld.cc@stripped, 2007-03-30 09:14:07+02:00, istruewing@stripped +0 -3
    Post merge fix

# 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.1-axmrg

--- 1.56/mysys/my_pthread.c	2007-03-30 09:14:20 +02:00
+++ 1.57/mysys/my_pthread.c	2007-03-30 09:14:20 +02:00
@@ -29,8 +29,6 @@
 #define SCHED_POLICY SCHED_OTHER
 #endif
 
-uint thd_lib_detected= 0;
-
 uint thd_lib_detected;
 
 #ifndef my_pthread_setprio

--- 1.626/sql/mysqld.cc	2007-03-30 09:14:20 +02:00
+++ 1.627/sql/mysqld.cc	2007-03-30 09:14:20 +02:00
@@ -599,9 +599,6 @@ pthread_mutex_t  LOCK_server_started;
 pthread_cond_t  COND_server_started;
 
 int mysqld_server_started= 0;
-#ifndef EMBEDDED_LIBRARY
-static uint thr_kill_signal;
-#endif
 
 File_parser_dummy_hook file_parser_dummy_hook;