Commit ab168f0e authored by tsmith@siva.hindu.god's avatar tsmith@siva.hindu.god

Merge tsmith@bk-internal.mysql.com:/home/bk/mysql-4.0

into  siva.hindu.god:/home/tsmith/m/bk/maint/40
parents 496d0d78 6d10340d
......@@ -4,7 +4,7 @@ dnl Process this file with autoconf to produce a configure script.
AC_INIT(sql/mysqld.cc)
AC_CANONICAL_SYSTEM
# The Docs Makefile.am parses this line!
AM_INIT_AUTOMAKE(mysql, 4.0.30)
AM_INIT_AUTOMAKE(mysql, 4.0.31)
AM_CONFIG_HEADER(config.h)
PROTOCOL_VERSION=10
......
......@@ -2251,7 +2251,11 @@ int main(int argc, char **argv)
#endif
/* Set signal used to kill MySQL */
#if defined(SIGUSR2)
thr_kill_signal= thd_lib_detected == THD_LIB_LT ? SIGINT : SIGUSR2;
#else
thr_kill_signal= SIGINT;
#endif
/*
Init mutexes for the global MYSQL_LOG objects.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment