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 | a93f29415b859138945375bb91118f6e77ae3d41 (patch) | |
| tree | e548cd4ee1df308359e71d1e5dba303cc179d7e5 /mysql-test | |
| parent | a5dcfbf9dad9bcff658c698be8f47913df6ec42d (diff) | |
| download | mariadb-git-a93f29415b859138945375bb91118f6e77ae3d41.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')
| -rwxr-xr-x | mysql-test/mysql-test-run.sh | 5 | ||||
| -rw-r--r-- | mysql-test/r/mrg000002.result | 1 | ||||
| -rw-r--r-- | mysql-test/t/mrg000001.test | 4 |
3 files changed, 8 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=$? diff --git a/mysql-test/r/mrg000002.result b/mysql-test/r/mrg000002.result index e69de29bb2d..b4960c74ae6 100644 --- a/mysql-test/r/mrg000002.result +++ b/mysql-test/r/mrg000002.result @@ -0,0 +1 @@ +c diff --git a/mysql-test/t/mrg000001.test b/mysql-test/t/mrg000001.test index 1c533e91131..eb9f5ebe49e 100644 --- a/mysql-test/t/mrg000001.test +++ b/mysql-test/t/mrg000001.test @@ -15,3 +15,7 @@ INSERT INTO test1 VALUES (11,20),(13,43),(15,11),(17,22),(19,37); INSERT INTO test2 VALUES (12,25),(14,31),(16,42),(18,27),(10,30); @r/mrg000001.result SELECT * from test3 where incr in (1,2,3,4) order by othr; + +DROP TABLE IF EXISTS test3; +DROP TABLE IF EXISTS test1; +DROP TABLE IF EXISTS test2; |