database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-29 00:08:14 +03:00
Code Activity

mysql-test-run.sh remove *.reject before testing

Browse Source 
mrg000001.test	clean merge tables for other tests to work
mysqltest.c	always compare vs. @result if any
mrg000002.result	corrected
This commit is contained in:
serg@serg.mysql.com
2000-12-22 20:10:35 +01:00
parent 74d4eb53a0
commit 06b0f81586
4 changed files with 64 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -339,7 +339,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
@@ -360,7 +360,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
@@ -450,6 +450,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=$?