bk commit into 4.0 tree

[sasha]

Below is the list of changes that have just been committed into a
4.0 repository of sasha. When sasha does a push, they will be propogated 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://www.mysql.com/doc/I/n/Installing_source_tree.html

ChangeSet@stripped, 2001-10-25 08:57:11-06:00, sasha@stripped
  remove hard-coded directory from test result in rpl000001

  mysql-test/r/rpl000001.result
    1.12 01/10/25 08:57:10 sasha@stripped +1 -1
    make the test "sasha-independent"

  mysql-test/t/rpl000001.test
    1.23 01/10/25 08:57:10 sasha@stripped +1 -0
    make the test "sasha-independent"

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sasha
# Host:	mysql.sashanet.com
# Root:	/home/sasha/src/bk/mysql-4.0

--- 1.11/mysql-test/r/rpl000001.result	Tue Oct 23 13:27:19 2001
+++ 1.12/mysql-test/r/rpl000001.result	Thu Oct 25 08:57:10 2001
@@ -7,7 +7,7 @@
 drop table if exists t1,t3;
 create table t1 (word char(20) not null);
 load data infile '../../std_data/words.dat' into table t1;
- load data local infile '/home/sasha/bk/mysql-4.0/mysql-test/std_data/words.dat' into table t1;
+ load data local infile '$MYSQL_TEST_DIR/std_data/words.dat' into table t1;
 select * from t1;
 word
 Aarhus

--- 1.22/mysql-test/t/rpl000001.test	Tue Oct 23 13:27:20 2001
+++ 1.23/mysql-test/t/rpl000001.test	Thu Oct 25 08:57:10 2001
@@ -1,3 +1,4 @@
+eval_result;
 source include/master-slave.inc;
 connection master;
 use test;