bk commit into 5.1 tree (kent:1.2376)

[kent]

Below is the list of changes that have just been committed into a local
5.1 repository of kent. When kent 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-01-01 09:55:35+01:00, kent@kent-amd64.(none) +2 -0
  Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build
  into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build
  MERGE: 1.1810.2362.37

  configure.in@stripped, 2007-01-01 09:55:32+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.245.1.171

  sql/mysqld.cc@stripped, 2007-01-01 09:55:32+01:00, kent@kent-amd64.(none) +0 -0
    Auto merged
    MERGE: 1.439.1.146

# 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:	kent
# Host:	kent-amd64.(none)
# Root:	/home/kent/bk/tmp/mysql-5.1-build/RESYNC

--- 1.410/configure.in	2007-01-01 09:55:41 +01:00
+++ 1.411/configure.in	2007-01-01 09:55:41 +01:00
@@ -963,6 +963,8 @@
     fi
     ;;
   *darwin*)
+    AC_DEFINE([DEFAULT_SKIP_THREAD_PRIORITY], [1], [default to skip thread priority])
+    CPPFLAGS="-D"
     if test "$ac_cv_prog_gcc" = "yes"
     then
       FLAGS="-D_P1003_1B_VISIBLE -DSIGNAL_WITH_VIO_CLOSE -DSIGNALS_DONT_BREAK_READ
-DIGNORE_SIGHUP_SIGQUIT"

--- 1.603/sql/mysqld.cc	2007-01-01 09:55:41 +01:00
+++ 1.604/sql/mysqld.cc	2007-01-01 09:55:41 +01:00
@@ -49,6 +49,10 @@
 #define OPT_NDBCLUSTER_DEFAULT 0
 #endif
 
+#ifndef DEFAULT_SKIP_THREAD_PRIORITY
+#define DEFAULT_SKIP_THREAD_PRIORITY 0
+#endif
+
 #include <thr_alarm.h>
 #include <ft_global.h>
 #include <errmsg.h>
@@ -5633,8 +5637,8 @@
   {"skip-symlink", OPT_SKIP_SYMLINKS, "Don't allow symlinking of tables. Deprecated
option.  Use --skip-symbolic-links instead.",
    0, 0, 0, GET_NO_ARG, NO_ARG, 0, 0, 0, 0, 0, 0},
   {"skip-thread-priority", OPT_SKIP_PRIOR,
-   "Don't give threads different priorities.", 0, 0, 0, GET_NO_ARG, NO_ARG, 0,
-   0, 0, 0, 0, 0},
+   "Don't give threads different priorities.", 0, 0, 0, GET_NO_ARG, NO_ARG,
+   DEFAULT_SKIP_THREAD_PRIORITY, 0, 0, 0, 0, 0},
 #ifdef HAVE_REPLICATION
   {"slave-load-tmpdir", OPT_SLAVE_LOAD_TMPDIR,
    "The location where the slave should put its temporary files when \