database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

client/mysqltest.c

Browse Source 
add --result-file option
mysql-test/mysql-test-run
    do a really good job to kill mysqld if it is stuck
This commit is contained in:
sasha@mysql.sashanet.com
2000-12-12 12:12:41 -07:00
parent ca5e1f6d95
commit 569ac55c61
2 changed files with 175 additions and 110 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
mysql-test/mysql-test-run
View File

@ -361,6 +361,18 @@ stop_slave ()
if [ x$SLAVE_RUNNING = x1 ]
then
$MYSQLADMIN --no-defaults --socket=$SLAVE_MYSOCK -u root shutdown
if [ $? != 0 ] ; then # try harder!
echo "slave not cooperating with mysqladmin, will try manual kill"
kill `cat $SLAVE_MYPID`
sleep 2
if [ -f $SLAVE_MYPID ] ; then
echo "slave refused to die, resorting to SIGKILL murder"
kill -9 `cat $SLAVE_MYPID`
rm -f $SLAVE_MYPID
else
echo "slave responded to SIGTERM "
fi
fi
SLAVE_RUNNING=0
fi
}
@ -370,6 +382,18 @@ stop_master ()
if [ x$MASTER_RUNNING = x1 ]
then
$MYSQLADMIN --no-defaults --socket=$MASTER_MYSOCK -u root shutdown
if [ $? != 0 ] ; then # try harder!
echo "master not cooperating with mysqladmin, will try manual kill"
kill `cat $MASTER_MYPID`
sleep 2
if [ -f $MASTER_MYPID ] ; then
echo "master refused to die, resorting to SIGKILL murder"
kill -9 `cat $MASTER_MYPID`
rm -f $MASTER_MYPID
else
echo "master responded to SIGTERM "
fi
fi
MASTER_RUNNING=0
fi
}