bk commit into 5.1 tree (knielsen:1.2167)

[knielsen]

Below is the list of changes that have just been committed into a local
5.1 repository of knielsen. When knielsen 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
  1.2167 06/02/24 10:15:39 knielsen@stripped +1 -0
  Fix mysqldump.test to work with non-standard --vardir.

  mysql-test/t/mysqldump.test
    1.88 06/02/24 10:15:26 knielsen@stripped +4 -4
    Fix mysqldump.test to work with non-standard --vardir.

# 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:	knielsen
# Host:	rt.int.sifira.dk
# Root:	/usr/local/mysql/mysql-5.1-new

--- 1.87/mysql-test/t/mysqldump.test	2006-02-23 10:54:52 +01:00
+++ 1.88/mysql-test/t/mysqldump.test	2006-02-24 10:15:26 +01:00
@@ -1064,14 +1064,14 @@
 create algorithm =temptable view v5 as select * from t1;
 
 # dump tables and views
---exec $MYSQL_DUMP test > var/tmp/bug14871.sql
+--exec $MYSQL_DUMP test > $MYSQLTEST_VARDIR/tmp/bug14871.sql
 
 # drop the db, tables and views
 drop table t1;
 drop view v1, v2, v3, v4, v5;
 
 # Reload dump
---exec $MYSQL test < var/tmp/bug14871.sql
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug14871.sql
 
 # check that all tables and views could be created
 show tables;
@@ -1098,13 +1098,13 @@
 delimiter ;|
 
 # dump table and trigger
---exec $MYSQL_DUMP test > var/tmp/bug16878.sql
+--exec $MYSQL_DUMP test > $MYSQLTEST_VARDIR/tmp/bug16878.sql
 drop trigger tr1;
 drop trigger tr2;
 drop table t1, t2;
 
 # reload dump
---exec $MYSQL test < var/tmp/bug16878.sql
+--exec $MYSQL test < $MYSQLTEST_VARDIR/tmp/bug16878.sql
 --replace_column 6 #
 show triggers;
 drop trigger tr1;