mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-18 21:12:26 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge jcole@work.mysql.com:/home/bk/mysql

Browse source 
into tetra.spaceapes.com:/usr/home/jcole/bk/mysql
This commit is contained in:
jcole@tetra.spaceapes.com 2000-09-25 14:26:15 -05:00
commit 036dfc00bf
4 changed files with 28 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
BitKeeper/etc/logging_ok
View file

@ -3,12 +3,14 @@ davida@work.mysql.com
jamppa@work.mysql.com
jcole@ham.spaceapes.com
jcole@jcole.burghcom.com
jcole@nslinux.bedford.progress.com
jcole@tetra.bedford.progress.com
jcole@tetra.spaceapes.com
matt@work.mysql.com
mwagner@evoq.home.mwagner.org
monty@donna.mysql.com
monty@work.mysql.com
mwagner@evoq.home.mwagner.org
nusphere@main.burghcom.com
paul@central.snake.net
paul@work.mysql.com
sasha@mysql.sashanet.com
@ -19,5 +21,3 @@ sinisa@work.mysql.com
tim@localhost.polyesthetic.msg
tim@work.mysql.com
tonu@work.mysql.com
jcole@nslinux.bedford.progress.com
nusphere@main.burghcom.com

35
Docs/manual.texi
View file

@ -3593,12 +3593,12 @@ Czech Republic [Masaryk University in Brno] @
@uref{http://mysql.linux.cz/index.html, WWW}
@uref{ftp://ftp.fi.muni.cz/pub/mysql/, FTP}
@c @item
@item
@c Added: 990920
@c Not ok 20000919; Old site (Matt)
@c EMAIL: <radek@sopik.cz> (Radek Libovicky)
@c @image{Flags/czech-republic} Czech Republic [www.sopik.cz] @
@c @uref{http://www.mysql.cz/, WWW}
@c @image{Flags/czech-republic}
Czech Republic [www.sopik.cz] @
@uref{http://www.mysql.cz/, WWW}
@item
@c Added: 000418
@ -3692,12 +3692,12 @@ Greece [NTUA, Athens] @
@uref{http://www.ntua.gr/mysql/, WWW}
@uref{ftp://ftp.ntua.gr/pub/databases/mysql/, FTP}
@c @item
@c File not found 990730
@item
@c EMAIL: torlasz@xenia.sote.hu (Laszlo L. Tornoc)
@c @image{Flags/hungary} Hungary [Xenia] @
@c @uref{http://xenia.sote.hu/ftp/mirrors/www.mysql.com/, WWW}
@c @uref{ftp://xenia.sote.hu/pub/mirrors/www.mysql.com/,FTP}
@c @image{Flags/hungary}
Hungary [Xenia] @
@uref{http://mysql.sote.hu/, WWW}
@uref{ftp://xenia.sote.hu/pub/mirrors/www.mysql.com/, FTP}
@item
@c EMAIL: mirrors@gm.is (Tomas Edwardsson)
@ -3753,12 +3753,12 @@ Poland [Sunsite] @
@c @uref{http://mysql.leirianet.pt, WWW}
@c @uref{ftp://ftp.leirianet.pt/pub/mysql/,FTP}
@c @item
@c Not ok 20000919; Old site (Matt)
@item
@c EMAIL: kuzmin@dn.ru (Roma Kuzmin)
@c @image{Flags/russia} Russia [DirectNet] @
@c @uref{http://mysql.directnet.ru/, WWW}
@c @uref{ftp://ftp.dn.ru/pub/MySQL/, FTP}
@c @image{Flags/russia}
Russia [DirectNet] @
@uref{http://mysql.directnet.ru/, WWW}
@uref{ftp://ftp.dn.ru/pub/MySQL/, FTP}
@c @item
@c down 990113
@ -3988,6 +3988,13 @@ USA [LinuxWired/Scottsdale, AZ] @
@c @image{Flags/chile} Chile [Vision] @
@c @uref{http://mysql.vision.cl/, WWW}
@item
@c EMAIL: bartschm@psi.com (Marcelo Bartsch)
@c @image{Flags/chile}
Chile [PSINet] @
@uref{http://mysql.psinet.cl/, WWW}
@uref{ftp://ftp.psinet.cl/pub/database/mysql/, FTP}
@c @item
@c Removed 990730
@c @c EMAIL: dan@amerikanclaris.com (Danilo Lotina F.)

6
configure.in
View file

@ -341,13 +341,13 @@ AC_PATH_PROG(KILL, kill, kill)
AC_MSG_CHECKING("for kill switches")
if $ac_cv_path_KILL -0 $$
then
CHECK_PID="$ac_cv_path_KILL -0 \$\$PID"
CHECK_PID="$ac_cv_path_KILL -0 \$\$PID > /dev/null 2> /dev/null"
elif kill -s 0 $$
then
CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID"
CHECK_PID="$ac_cv_path_KILL -s 0 \$\$PID > /dev/null 2> /dev/null"
else
AC_MSG_WARN([kill -0 to check for pid seems to fail])
CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID"
CHECK_PID="$ac_cv_path_KILL -s SIGCONT \$\$PID > /dev/null 2> /dev/null"
fi
AC_SUBST(CHECK_PID)
AC_MSG_RESULT("$CHECK_PID")

2
scripts/safe_mysqld.sh
View file

@ -91,7 +91,7 @@ fi
NOHUP_NICENESS="nohup"
if test -w /
then
NOHUP_NICENESS=`nohup nice`
NOHUP_NICENESS=`nohup nice 2>&1`
if test $? -eq 0 && test x"$NOHUP_NICENESS" != x0 && nice --1 echo foo > /dev/null 2>&1; then
NOHUP_NICENESS="nice --$NOHUP_NICENESS nohup"
else