bk commit into 6.0 tree (msvensson:1.2646)

[msvensson]

Below is the list of changes that have just been committed into a local
6.0 repository of msvensson.  When msvensson does a push these changes
will be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2008-04-30 16:14:51+02:00, msvensson@stripped +1 -0
  Replace unportable "system rm" with remove_file

  mysql-test/suite/binlog/t/binlog_killed_simulate.test@stripped, 2008-04-30 16:14:48+02:00, msvensson@stripped +2 -2
    Replace unportable "system rm" with remove_file

diff -Nrup a/mysql-test/suite/binlog/t/binlog_killed_simulate.test b/mysql-test/suite/binlog/t/binlog_killed_simulate.test
--- a/mysql-test/suite/binlog/t/binlog_killed_simulate.test	2008-04-08 08:34:29 +02:00
+++ b/mysql-test/suite/binlog/t/binlog_killed_simulate.test	2008-04-30 16:14:48 +02:00
@@ -35,7 +35,7 @@ let $error_code= `select @a like "%#%err
 eval select $error_code /* must return 1 as query completed before got killed*/;
 
 # cleanup for the sub-case
-system rm $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;
+remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;
 
 
 #
@@ -63,7 +63,7 @@ let $error_code= `select @a like "%#%err
 eval select $error_code /* must return 0 to mean the killed query is in */;
 
 # cleanup for the sub-case
-system rm $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;
+remove_file $MYSQLTEST_VARDIR/tmp/binlog_killed_bug27571.binlog;
 
 
 drop table t1,t2;