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

Merge

Browse Source 
BitKeeper/etc/gone:
  auto-merge
mysql-test/mysql-test-run.sh:
  merged
This commit is contained in:
unknown
2000-12-22 20:23:03 +01:00
parent c80fe38620 a93f29415b
commit 7e681f11e1
5 changed files with 65 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
mysql-test/mysql-test-run.sh
View File

@ -327,7 +327,7 @@ stop_slave ()
if [ -f $SLAVE_MYPID ] ; then
echo "slave refused to die, resorting to SIGKILL murder"
kill -9 `cat $SLAVE_MYPID`
rm -f $SLAVE_MYPID
$RM -f $SLAVE_MYPID
else
echo "slave responded to SIGTERM "
fi
@ -348,7 +348,7 @@ stop_master ()
if [ -f $MASTER_MYPID ] ; then
echo "master refused to die, resorting to SIGKILL murder"
kill -9 `cat $MASTER_MYPID`
rm -f $MASTER_MYPID
$RM -f $MASTER_MYPID
else
echo "master responded to SIGTERM "
fi
@ -438,6 +438,7 @@ run_testcase ()
cd $MYSQL_TEST_DIR
if [ -f $tf ] ; then
$RM -f r/$tname.*.reject
mytime=`$TIME -p $MYSQL_TEST -R r/$tname.result $extra_flags \
< $tf 2> $TIMEFILE`
res=$?