Merge

BitKeeper/etc/gone:
  auto-merge
mysql-test/mysql-test-run.sh:
  merged

BitKeeper/etc/gone

@@ -281,6 +281,7 @@ mwagner@work.mysql.com|mysql-test/r/3.23/sel000002.result|20001010091454|29230|d
 sasha@mysql.sashanet.com|BitKeeper/etc/logging_ok|20000801000905|12967|5b7d847a2158554
 sasha@mysql.sashanet.com|libmysql_r/acconfig.h|20001128060846|51084|65f1202b3b5c345f
 sasha@mysql.sashanet.com|mysql-test/README.gcov|20001012045950|28177|5a6da067a30780ce
+sasha@mysql.sashanet.com|mysql-test/README.gcov|20001214012355|41825|2de7575ca81155e5
 sasha@mysql.sashanet.com|mysql-test/README|20001010001022|12739|108667adaeabe3f5
 sasha@mysql.sashanet.com|mysql-test/r/3.23/alt000001.result|20001122072330|24729|393103dbf15f35c9
 sasha@mysql.sashanet.com|mysql-test/r/3.23/ins000001.result|20001018175743|49824|f45c599efdf8352b
@@ -328,4 +329,3 @@ serg@serg.mysql.com|mysql-test/r/ft0000002.c.result|20001212120059|07173|cd66b90
 serg@serg.mysql.com|mysql-test/r/sel000031.result|20001211130803|03576|d49aeac63ad7db4d
 serg@serg.mysql.com|mysql-test/r/sel000032.result|20001211130803|08537|6cb30e23cbca9fb0
 serg@serg.mysql.com|mysql-test/r/sel000033.result|20001211130803|13548|56d1d02d72b94602
-sasha@mysql.sashanet.com|mysql-test/README.gcov|20001214012355|41825|2de7575ca81155e5

client/mysqltest.c

@@ -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

@@ -327,7 +327,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
@@ -348,7 +348,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
@@ -438,6 +438,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

+c	

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;