Merge rkalimullin@bk-internal.mysql.com:/home/bk/mysql-5.0

into  mysql.com:/usr/home/ram/work/5.0.b12917

mysql-test/mysql-test-run.pl

@@ -179,6 +179,7 @@ our $exe_mysql_fix_system_tables;
 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 @@ sub executable_setup () {
     $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 @@ sub executable_setup () {
     $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 @@ sub run_mysqltest ($) {
   $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;

mysql-test/mysql-test-run.sh

@@ -575,6 +575,7 @@ if [ x$SOURCE_DIST = x1 ] ; then
  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 @@ else
  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_BINLOG="$MYSQL_BINLOG --no-defaults --local-load=$MYSQL_TMP_DIR  --charact
 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

mysql-test/r/mysqldump.result

@@ -1875,6 +1875,8 @@ set @fired:= "No";
 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
 DROP TABLE IF EXISTS `test1`;
 Warnings:
 Note	1051	Unknown table 'test1'

mysql-test/t/mysqldump.test

@@ -762,7 +762,20 @@ show tables;
 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
+
+#
 # Test of fix to BUG 12597
+#
+
 DROP TABLE IF EXISTS `test1`;
 CREATE TABLE `test1` (
   `a1` int(11) default NULL

mysys/default.c

@@ -137,6 +137,9 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv,
   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
     load_defaults() as otherwise we can't know the type of 'func_ctx'