bk commit into 5.0 tree (msvensson:1.2092)

[msvensson]

Below is the list of changes that have just been committed into a local
5.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
  1.2092 06/03/01 22:52:00 msvensson@neptunus.(none) +2 -0
  Fix for running "mysqldump" test on Windows

  mysql-test/std_data/config_file.cnf
    1.1 06/03/01 22:51:56 msvensson@neptunus.(none) +6 -0
    New BitKeeper file ``mysql-test/std_data/config_file.cnf''

  mysql-test/t/mysqldump.test
    1.84 06/03/01 22:51:56 msvensson@neptunus.(none) +2 -6
    Use a handwritten cnf file instead of generating one on the fly.

  mysql-test/std_data/config_file.cnf
    1.0 06/03/01 22:51:56 msvensson@neptunus.(none) +0 -0
    BitKeeper file /home/msvensson/mysql/mysql-5.0/mysql-test/std_data/config_file.cnf

# 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:	msvensson
# Host:	neptunus.(none)
# Root:	/home/msvensson/mysql/mysql-5.0
--- New file ---
+++ mysql-test/std_data/config_file.cnf	06/03/01 22:51:56
#
# Bugs #9136, #12917: problems with --defaults-extra-file option
#  - Used from mysqldump.test
#
[mysqltest1]
port=1234


--- 1.83/mysql-test/t/mysqldump.test	2006-02-24 13:50:22 +01:00
+++ 1.84/mysql-test/t/mysqldump.test	2006-03-01 22:51:56 +01:00
@@ -829,12 +829,8 @@
 #
 # Bugs #9136, #12917: problems with --defaults-extra-file option
 #
-
---system echo "[mysqltest1]" > $MYSQLTEST_VARDIR/tmp/tmp.cnf
---system echo "port=1234" >> $MYSQLTEST_VARDIR/tmp/tmp.cnf
---exec $MYSQL_MY_PRINT_DEFAULTS -c $MYSQLTEST_VARDIR/tmp/tmp.cnf mysqltest1
---exec $MYSQL_MY_PRINT_DEFAULTS -e $MYSQLTEST_VARDIR/tmp/tmp.cnf mysqltest1 mysqltest1
---system rm $MYSQLTEST_VARDIR/tmp/tmp.cnf
+--exec $MYSQL_MY_PRINT_DEFAULTS -c $MYSQL_TEST_DIR/std_data/config_file.cnf mysqltest1
+--exec $MYSQL_MY_PRINT_DEFAULTS -e $MYSQL_TEST_DIR/std_data/config_file.cnf mysqltest1 mysqltest1
 
 #
 # Test of fix to BUG 12597