Commit 58d17d01 authored by unknown's avatar unknown
Browse files

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

into ua141d10.elisa.omakaista.fi:/home/my/bk/mysql-5.0
parents f6dd8094 b7322bad

include/config-win.h

+3 −0
Original line number Diff line number Diff line
@@ -332,6 +332,9 @@ inline double ulonglong2double(ulonglong value) 
#define SHAREDIR		"share"

#define DEFAULT_CHARSET_HOME	"C:/mysql/"

#endif

#ifndef DEFAULT_HOME_ENV

#define DEFAULT_HOME_ENV MYSQL_HOME

#endif



/* File name handling */

libmysql/Makefile.shared

+1 −0
Original line number Diff line number Diff line
@@ -81,6 +81,7 @@ CLEANFILES = $(target_libadd) $(SHLIBOBJS) \ 
			$(target)

DEFS =			-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \

			-DDATADIR="\"$(MYSQLDATAdir)\"" \

			-DDEFAULT_HOME_ENV=MYSQL_HOME \

			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)



# The automatic dependencies miss this

mysys/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \ 
			-DDATADIR="\"$(MYSQLDATAdir)\"" \

			-DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \

			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \

			-DDEFAULT_HOME_ENV=MYSQL_HOME \

                        @DEFS@



libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@

mysys/default.c

+25 −17
Original line number Diff line number Diff line
@@ -45,23 +45,8 @@ char *defaults_extra_file=0; 


/* Which directories are searched for options (and in which order) */



const char *default_directories[]= {

#ifdef __WIN__

"C:/",

#elif defined(__NETWARE__)

"sys:/etc/",

#else

"/etc/",

#endif

#ifdef DATADIR

DATADIR,

#endif

"",					/* Place for defaults_extra_dir */

#if !defined(__WIN__) && !defined(__NETWARE__)

"~/",

#endif

NullS,

};

#define MAX_DEFAULT_DIRS 4

const char *default_directories[MAX_DEFAULT_DIRS + 1];



#ifdef __WIN__

static const char *f_extensions[]= { ".ini", ".cnf", 0 };
@@ -89,6 +74,7 @@ static int search_default_file_with_ext(Process_option_func func, 
                                        void *func_ctx,

					const char *dir, const char *ext,

					const char *config_file);

static void init_default_directories();



static char *remove_end_comment(char *ptr);
@@ -319,6 +305,7 @@ int load_defaults(const char *conf_file, const char **groups, 
  struct handle_option_ctx ctx;

  DBUG_ENTER("load_defaults");



  init_default_directories();

  init_alloc_root(&alloc,512,0);

  if (*argc >= 2 && !strcmp(argv[0][1],"--no-defaults"))

  {
@@ -652,6 +639,7 @@ void print_defaults(const char *conf_file, const char **groups) 
  char name[FN_REFLEN], **ext;

  const char **dirs;



  init_default_directories();

  puts("\nDefault options are read from the following files in the given order:");



  if (dirname_length(conf_file))
@@ -714,3 +702,23 @@ void print_defaults(const char *conf_file, const char **groups) 
}



#include <help_end.h>



static void init_default_directories()

{

  const char *env, **ptr= default_directories;



#ifdef __WIN__

  *ptr++= "C:/";

#elif defined(__NETWARE__)

  *ptr++= "sys:/etc/";

#else

  *ptr++= "/etc/";

#endif

  if ((env= getenv(STRINGIFY_ARG(DEFAULT_HOME_ENV))))

    *ptr++= env;

  *ptr++= "";			/* Place for defaults_extra_file */

#if !defined(__WIN__) && !defined(__NETWARE__)

  *ptr++= "~/";;

#endif

  *ptr= 0;			/* end marker */

}

scripts/mysqld_multi.sh

+11 −1
Original line number Diff line number Diff line
@@ -4,7 +4,7 @@ use Getopt::Long; 
use POSIX qw(strftime);



$|=1;

$VER="2.11";

$VER="2.12";



$opt_config_file   = undef();

$opt_example       = 0;
@@ -430,6 +430,16 @@ sub find_groups 
    {

      $data[$i] = $line;

    }

    if (defined($ENV{MYSQL_HOME}) && -f "$ENV{MYSQL_HOME}/my.cnf" &&

	-r "$ENV{MYSQL_HOME}/my.cnf")

    {

      open(MY_CNF, "<$ENV{MYSQL_HOME}/my.cnf") && (@tmp=<MY_CNF>) &&

      close(MY_CNF);

    }

    for (; ($line = shift @tmp); $i++)

    {

      $data[$i] = $line;

    }

    if (-f "$homedir/.my.cnf" && -r "$homedir/.my.cnf")

    {

      open(MY_CNF, "<$homedir/.my.cnf") && (@tmp=<MY_CNF>) && close(MY_CNF);