Commit a93f2941 authored by unknown's avatar unknown

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
parent a5dcfbf9
...@@ -1147,7 +1147,7 @@ int run_query(MYSQL* mysql, struct query* q) ...@@ -1147,7 +1147,7 @@ int run_query(MYSQL* mysql, struct query* q)
if(!result_file) if(!result_file)
str_to_file(q->record_file, ds->str, ds->len); str_to_file(q->record_file, ds->str, ds->len);
} }
else if(!result_file && q->record_file[0]) else if(q->record_file[0])
{ {
error = check_result(ds, q->record_file); error = check_result(ds, q->record_file);
} }
......
...@@ -339,7 +339,7 @@ stop_slave () ...@@ -339,7 +339,7 @@ stop_slave ()
if [ -f $SLAVE_MYPID ] ; then if [ -f $SLAVE_MYPID ] ; then
echo "slave refused to die, resorting to SIGKILL murder" echo "slave refused to die, resorting to SIGKILL murder"
kill -9 `cat $SLAVE_MYPID` kill -9 `cat $SLAVE_MYPID`
rm -f $SLAVE_MYPID $RM -f $SLAVE_MYPID
else else
echo "slave responded to SIGTERM " echo "slave responded to SIGTERM "
fi fi
...@@ -360,7 +360,7 @@ stop_master () ...@@ -360,7 +360,7 @@ stop_master ()
if [ -f $MASTER_MYPID ] ; then if [ -f $MASTER_MYPID ] ; then
echo "master refused to die, resorting to SIGKILL murder" echo "master refused to die, resorting to SIGKILL murder"
kill -9 `cat $MASTER_MYPID` kill -9 `cat $MASTER_MYPID`
rm -f $MASTER_MYPID $RM -f $MASTER_MYPID
else else
echo "master responded to SIGTERM " echo "master responded to SIGTERM "
fi fi
...@@ -450,6 +450,7 @@ run_testcase () ...@@ -450,6 +450,7 @@ run_testcase ()
cd $MYSQL_TEST_DIR cd $MYSQL_TEST_DIR
if [ -f $tf ] ; then if [ -f $tf ] ; then
$RM -f r/$tname.*.reject
mytime=`$TIME -p $MYSQL_TEST -R r/$tname.result $extra_flags \ mytime=`$TIME -p $MYSQL_TEST -R r/$tname.result $extra_flags \
< $tf 2> $TIMEFILE` < $tf 2> $TIMEFILE`
res=$? res=$?
......
...@@ -15,3 +15,7 @@ INSERT INTO test1 VALUES (11,20),(13,43),(15,11),(17,22),(19,37); ...@@ -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); 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; @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;
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment