Commit c458f5ae authored by unknown's avatar unknown
Browse files

Merge 192.168.0.20:mysql/bug15069/my50-bug15069 

into  neptunus.(none):/home/msvensson/mysql/mysql-5.0


libmysql/Makefile.shared:
  Auto merged
parents 6a1ec626 f2ff24bd

libmysql/Makefile.shared

+1 −0
Original line number Diff line number Diff line
@@ -85,6 +85,7 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \ 
			-DDATADIR="\"$(MYSQLDATAdir)\"" \

			-DDEFAULT_HOME_ENV=MYSQL_HOME \

			-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \

			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \

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



if HAVE_YASSL

mysys/Makefile.am

+1 −0
Original line number Diff line number Diff line
@@ -70,6 +70,7 @@ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \ 
			-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \

			-DDEFAULT_HOME_ENV=MYSQL_HOME \

			-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \

			-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \

                        @DEFS@



libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@

mysys/default.c

+9 −1
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ char *defaults_extra_file=0; 


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



#define MAX_DEFAULT_DIRS 6

#define MAX_DEFAULT_DIRS 7

const char *default_directories[MAX_DEFAULT_DIRS + 1];



#ifdef __WIN__
@@ -959,11 +959,13 @@ static uint my_get_system_windows_directory(char *buffer, uint size) 
    4. getenv(DEFAULT_HOME_ENV)

    5. Directory above where the executable is located

    6. ""

    7. --sysconfdir=<path>



  On Novell NetWare, this is:

    1. sys:/etc/

    2. getenv(DEFAULT_HOME_ENV)

    3. ""

    4. --sysconfdir=<path>



  On OS/2, this is:

    1. getenv(ETC)
@@ -971,12 +973,14 @@ static uint my_get_system_windows_directory(char *buffer, uint size) 
    3. getenv(DEFAULT_HOME_ENV)

    4. ""

    5. "~/"

    6. --sysconfdir=<path>



  Everywhere else, this is:

    1. /etc/

    2. getenv(DEFAULT_HOME_ENV)

    3. ""

    4. "~/"

    5. --sysconfdir=<path>



 */
@@ -1040,6 +1044,10 @@ static void init_default_directories() 
    }

    *ptr++= (char *)&config_dir;

  }

#endif

#ifdef DEFAULT_SYSCONFDIR

  if (DEFAULT_SYSCONFDIR != "")

    *ptr++= DEFAULT_SYSCONFDIR;

#endif

  *ptr= 0;			/* end marker */

}