bk commit into 5.1 tree (msvensson:1.2667)

[msvensson]

Below is the list of changes that have just been committed into a local
5.1 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, 2007-12-19 14:21:09+01:00, msvensson@stripped +1 -0
  Update path to master-bin file

  mysql-test/t/mysqlbinlog_base64.test@stripped, 2007-12-19 14:21:07+01:00,
msvensson@stripped +4 -3
    Update path to master-bin file
    Remove non portable "exec rm"

diff -Nrup a/mysql-test/t/mysqlbinlog_base64.test b/mysql-test/t/mysqlbinlog_base64.test
--- a/mysql-test/t/mysqlbinlog_base64.test	2007-12-12 18:19:02 +01:00
+++ b/mysql-test/t/mysqlbinlog_base64.test	2007-12-19 14:21:07 +01:00
@@ -15,8 +15,9 @@ load data infile '../../std_data/words.d
 #
 #  Save binlog
 #
+let $MYSQLD_DATADIR=`select @@datadir`;
 flush logs;
---exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000001 >
$MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+--exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/master-bin.000001 >
$MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 
 #
 #  Clear database and restore from binlog
@@ -51,7 +52,7 @@ insert into t2 select * from t2;
 select count(*) from t2;
 
 flush logs;
---exec $MYSQL_BINLOG --hexdump $MYSQLTEST_VARDIR/log/master-bin.000003 >
$MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+--exec $MYSQL_BINLOG --hexdump $MYSQLD_DATADIR/master-bin.000003 >
$MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 --exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 
 #
@@ -62,6 +63,6 @@ select count(*) from t2;
 #
 #  Test cleanup
 #
---exec rm $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
+--remove_file $MYSQLTEST_VARDIR/tmp/mysqlbinlog_base64.sql
 drop table t1;
 drop table t2;