Commit 06b0f815 authored by serg@serg.mysql.com's avatar serg@serg.mysql.com
Browse files

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
parent 74d4eb53

client/mysqltest.c

+56 −56
Original line number Diff line number Diff line
@@ -1147,7 +1147,7 @@ int run_query(MYSQL* mysql, struct query* q) 
      if(!result_file)

	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);

    }

mysql-test/mysql-test-run.sh

+3 −2
Original line number Diff line number Diff line
@@ -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=$?

mysql-test/r/mrg000002.result

+1 −0
Original line number Diff line number Diff line 
c

mysql-test/t/mrg000001.test

+4 −0
Original line number Diff line number Diff line
@@ -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;