bk commit into 5.1 tree (serg:1.2507)

[Sergei Golubchik]

Below is the list of changes that have just been committed into a local
5.1 repository of serg. When serg 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-28 17:12:38+02:00, serg@stripped +2 -0
  compiler warnings

  sql/mysqld.cc@stripped, 2007-03-28 17:12:35+02:00, serg@stripped +1 -1
    compiler warnings

  sql/stacktrace.c@stripped, 2007-03-28 17:12:35+02:00, serg@stripped +0 -2
    compiler warnings

# 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:	serg
# Host:	janus.mylan
# Root:	/usr/home/serg/Abk/mysql-5.1-build

--- 1.624/sql/mysqld.cc	2007-03-28 17:12:46 +02:00
+++ 1.625/sql/mysqld.cc	2007-03-28 17:12:46 +02:00
@@ -599,7 +599,6 @@
 pthread_cond_t  COND_server_started;
 
 int mysqld_server_started= 0;
-static uint thr_kill_signal;
 
 File_parser_dummy_hook file_parser_dummy_hook;
 
@@ -633,6 +632,7 @@
 #ifndef EMBEDDED_LIBRARY
 struct passwd *user_info;
 static pthread_t select_thread;
+static uint thr_kill_signal;
 #endif
 
 /* OS specific variables */

--- 1.25/sql/stacktrace.c	2007-03-28 17:12:46 +02:00
+++ 1.26/sql/stacktrace.c	2007-03-28 17:12:46 +02:00
@@ -53,8 +53,6 @@
 #define SIGRETURN_FRAME_OFFSET 23
 #endif
 
-static my_bool is_nptl;
-
 #if defined(__alpha__) && defined(__GNUC__)
 /*
   The only way to backtrace without a symbol table on alpha