diff options
| author | unknown <serg@serg.mysql.com> | 2000-12-22 20:10:35 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mysql.com> | 2000-12-22 20:10:35 +0100 |
| commit | 6fb150b837b00913748009ae3a54cdc181514531 (patch) | |
| tree | e548cd4ee1df308359e71d1e5dba303cc179d7e5 /mysql-test/mysql-test-run.sh | |
| parent | e94ec7301f1317a0a7dff35136c0fc7578719c96 (diff) | |
| download | mariadb-git-6fb150b837b00913748009ae3a54cdc181514531.tar.gz | |
mysql-test-run.sh remove *.reject before testing
mrg000001.test clean merge tables for other tests to work
mysqltest.c always compare vs. @result if any
mrg000002.result corrected
mysql-test/r/mrg000002.result:
corrected
client/mysqltest.c:
always compare vs. @result if any
mysql-test/t/mrg000001.test:
clean merge tables for other tests to work
mysql-test/mysql-test-run.sh:
remove *.reject before testing
Diffstat (limited to 'mysql-test/mysql-test-run.sh')
| -rwxr-xr-x | mysql-test/mysql-test-run.sh | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh index 5fe578b05a6..1571fb04796 100755 --- a/mysql-test/mysql-test-run.sh +++ b/mysql-test/mysql-test-run.sh @@ -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=$? |