Commit cf02f678 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/kent/bk/tmp/mysql-5.0-build 

into  mysql.com:/home/kent/bk/tmp/mysql-5.1-build


configure.in:
  Auto merged
sql/mysqld.cc:
  Auto merged
parents 394b9b32 690404db

configure.in

+2 −0
Original line number Diff line number Diff line
@@ -963,6 +963,8 @@ case $SYSTEM_TYPE in 
    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"

sql/mysqld.cc

+6 −2
Original line number Diff line number Diff line
@@ -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 @@ Can't be set to 1 if --log-slave-updates is used.", 
  {"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 \