bk commit into 5.0 tree (ramil:1.1967) BUG#12917

[ramil]

Below is the list of changes that have just been committed into a local
5.0 repository of ram. When ram 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.1967 05/09/09 12:51:43 ramil@stripped +5 -0
  A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client
binaries).
  

  mysys/default.c
    1.78 05/09/09 12:51:36 ramil@stripped +3 -0
    A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client
binaries).
    Set defaults_extra_file as we use it widely.

  mysql-test/t/mysqldump.test
    1.56 05/09/09 12:51:36 ramil@stripped +10 -0
    A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client
binaries).
    

  mysql-test/r/mysqldump.result
    1.62 05/09/09 12:51:36 ramil@stripped +2 -0
    A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client
binaries).
    

  mysql-test/mysql-test-run.sh
    1.273 05/09/09 12:51:36 ramil@stripped +3 -1
    A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client
binaries).
    MYSQL_MY_PRINT_DEFAULTS added

  mysql-test/mysql-test-run.pl
    1.42 05/09/09 12:51:36 ramil@stripped +6 -0
    A fix (bug #12917: The --defaults-extra-file option is ignored by the 5.0 client
binaries).
    MYSQL_MY_PRINT_DEFAULTS added

# 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:	ramil
# Host:	gw.mysql.r18.ru
# Root:	/usr/home/ram/work/5.0.b12917

--- 1.272/mysql-test/mysql-test-run.sh	2005-09-01 20:04:15 +05:00
+++ 1.273/mysql-test/mysql-test-run.sh	2005-09-09 12:51:36 +05:00
@@ -575,6 +575,7 @@
  CLIENT_BINDIR="$BASEDIR/client"
  MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"
  WAIT_PID="$BASEDIR/extra/mysql_waitpid"
+ MYSQL_MY_PRINT_DEFAULTS="$BASEDIR/extra/my_print_defaults"
  MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqltestmanagerc"
  MYSQL_MANAGER="$BASEDIR/tools/mysqltestmanager"
  MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqltestmanager-pwgen"
@@ -635,6 +636,7 @@
  MYSQL_BINLOG="$CLIENT_BINDIR/mysqlbinlog"
  MYSQLADMIN="$CLIENT_BINDIR/mysqladmin"
  WAIT_PID="$CLIENT_BINDIR/mysql_waitpid"
+ MYSQL_MY_PRINT_DEFAULTS="$CLIENT_BINDIR/my_print_defaults"
  MYSQL_MANAGER="$CLIENT_BINDIR/mysqltestmanager"
  MYSQL_MANAGER_CLIENT="$CLIENT_BINDIR/mysqltestmanagerc"
  MYSQL_MANAGER_PWGEN="$CLIENT_BINDIR/mysqltestmanager-pwgen"
@@ -716,7 +718,7 @@
 MYSQL_FIX_SYSTEM_TABLES="$MYSQL_FIX_SYSTEM_TABLES --no-defaults --host=localhost
--port=$MASTER_MYPORT --socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD
--basedir=$BASEDIR --bindir=$CLIENT_BINDIR --verbose"
 MYSQL="$MYSQL --no-defaults --host=localhost --port=$MASTER_MYPORT
--socket=$MASTER_MYSOCK --user=root --password=$DBPASSWD"
 export MYSQL MYSQL_DUMP MYSQL_SHOW MYSQL_BINLOG MYSQL_FIX_SYSTEM_TABLES
-export CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR
+export CLIENT_BINDIR MYSQL_CLIENT_TEST CHARSETSDIR MYSQL_MY_PRINT_DEFAULTS
 export NDB_TOOLS_DIR
 export NDB_MGM
 export NDB_BACKUP_DIR

--- 1.77/mysys/default.c	2005-07-29 07:06:31 +05:00
+++ 1.78/mysys/default.c	2005-09-09 12:51:36 +05:00
@@ -136,6 +136,9 @@
 
   if (! defaults_group_suffix)
     defaults_group_suffix= getenv(STRINGIFY_ARG(DEFAULT_GROUP_SUFFIX_ENV));
+
+  if (forced_extra_defaults)
+    defaults_extra_file= forced_extra_defaults;
   
   /*
     We can only handle 'defaults-group-suffix' if we are called from

--- 1.41/mysql-test/mysql-test-run.pl	2005-09-02 02:23:25 +05:00
+++ 1.42/mysql-test/mysql-test-run.pl	2005-09-09 12:51:36 +05:00
@@ -179,6 +179,7 @@
 our $exe_mysqltest;
 our $exe_slave_mysqld;
 our $exe_im;
+our $exe_my_print_defaults;
 
 our $opt_bench= 0;
 our $opt_small_bench= 0;
@@ -872,6 +873,8 @@
     $exe_mysql=          mtr_exe_exists("$path_client_bindir/mysql");
     $exe_mysql_fix_system_tables=
       mtr_script_exists("$glob_basedir/scripts/mysql_fix_privilege_tables");
+    $exe_my_print_defaults=
+      mtr_script_exists("$glob_basedir/extra/my_print_defaults");
     $path_ndb_tools_dir= mtr_path_exists("$glob_basedir/ndb/tools");
     $exe_ndb_mgm=        "$glob_basedir/ndb/src/mgmclient/ndb_mgm";
   }
@@ -887,6 +890,8 @@
     $exe_mysql_fix_system_tables=
       mtr_script_exists("$path_client_bindir/mysql_fix_privilege_tables",
 			"$glob_basedir/scripts/mysql_fix_privilege_tables");
+    $exe_my_print_defaults=
+      mtr_script_exists("path_client_bindir/my_print_defaults");
 
     $path_language=      mtr_path_exists("$glob_basedir/share/mysql/english/",
                                          "$glob_basedir/share/english/");
@@ -2384,6 +2389,7 @@
   $ENV{'MYSQL_FIX_SYSTEM_TABLES'}=  $cmdline_mysql_fix_system_tables;
   $ENV{'MYSQL_CLIENT_TEST'}=        $cmdline_mysql_client_test;
   $ENV{'CHARSETSDIR'}=              $path_charsetsdir;
+  $ENV{'MYSQL_MY_PRINT_DEFAULTS'}=  $exe_my_print_defaults;
 
   $ENV{'NDB_STATUS_OK'}=            $flag_ndb_status_ok;
   $ENV{'NDB_MGM'}=                  $exe_ndb_mgm;

--- 1.61/mysql-test/r/mysqldump.result	2005-07-30 11:24:47 +05:00
+++ 1.62/mysql-test/r/mysqldump.result	2005-09-09 12:51:36 +05:00
@@ -1875,3 +1875,5 @@
 end if;
 end	BEFORE	#	STRICT_TRANS_TABLES,STRICT_ALL_TABLES,NO_ZERO_IN_DATE,NO_ZERO_DATE,ERROR_FOR_DIVISION_BY_ZERO,TRADITIONAL,NO_AUTO_CREATE_USER
 DROP TABLE t1, t2;
+--port=1234
+--port=1234

--- 1.55/mysql-test/t/mysqldump.test	2005-07-30 01:40:00 +05:00
+++ 1.56/mysql-test/t/mysqldump.test	2005-09-09 12:51:36 +05:00
@@ -762,3 +762,13 @@
 --replace_column 6 #
 show triggers;
 DROP TABLE t1, t2;
+
+#
+# Bugs #9136, #12917: problems with --defaults-extra-file option
+#
+
+--exec echo "[client]" > $MYSQL_TEST_DIR/var/tmp/tmp.cnf
+--exec echo "port=1234" >> $MYSQL_TEST_DIR/var/tmp/tmp.cnf
+--exec $MYSQL_MY_PRINT_DEFAULTS -c $MYSQL_TEST_DIR/var/tmp/tmp.cnf client
+--exec $MYSQL_MY_PRINT_DEFAULTS -e $MYSQL_TEST_DIR/var/tmp/tmp.cnf client
+--exec rm $MYSQL_TEST_DIR/var/tmp/tmp.cnf