bk commit into 5.0 tree (tnurnberg:1.2206) BUG#20588

[Tatjana A Nuernberg]

Below is the list of changes that have just been committed into a local
5.0 repository of tnurnberg. When tnurnberg 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.2206 06/06/23 00:32:43 tnurnberg@stripped +1 -0
  Bug#20588: mysqldump.test may fail, depending on system-wide configuration
  
  mysqldump.test calls my_print_defaults in a way that includes the systemwide
  my.cnf, so the results will be beyond our control and depend on whatever the
  user has in their my.cnf, namely the [mysqldump] section.
  
  call my_print_defaults with --config-file rather than --defaults-extra-file
  to prevent inclusion of system-wide defaults and use our config-file only.

  mysql-test/t/mysqldump.test
    1.92 06/06/23 00:32:36 tnurnberg@stripped +1 -1
    call my_print_defaults with our setup only, do not include the systemwide
    my.cnf as that would make the results unpredictable.

# 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:	tnurnberg
# Host:	salvation.intern.azundris.com
# Root:	/home/tnurnberg/mysql-5.0-maint-20588

--- 1.91/mysql-test/t/mysqldump.test	2006-06-20 23:17:01 +02:00
+++ 1.92/mysql-test/t/mysqldump.test	2006-06-23 00:32:36 +02:00
@@ -610,7 +610,7 @@
 # BUG#15328 Segmentation fault occured if my.cnf is invalid for escape sequence
 #
 
---exec $MYSQL_MY_PRINT_DEFAULTS --defaults-extra-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump
+--exec $MYSQL_MY_PRINT_DEFAULTS --config-file=$MYSQL_TEST_DIR/std_data/bug15328.cnf mysqldump
 
 
 #