database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 192.168.0.20:mysql/bug15069/my50-bug15069

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


libmysql/Makefile.shared:
  Auto merged
This commit is contained in:
unknown
2006-04-10 15:13:30 +02:00
parent 6a1ec62660 f2ff24bd62
commit c458f5ae93
3 changed files with 11 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
libmysql/Makefile.shared
View File

@ -85,6 +85,7 @@ DEFS = -DDEFAULT_CHARSET_HOME="\"$(MYSQLBASEdir)\"" \
-DDATADIR="\"$(MYSQLDATAdir)\"" \ -DDATADIR="\"$(MYSQLDATAdir)\"" \
-DDEFAULT_HOME_ENV=MYSQL_HOME \ -DDEFAULT_HOME_ENV=MYSQL_HOME \
-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \ -DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs) -DSHAREDIR="\"$(MYSQLSHAREdir)\"" $(target_defs)
if HAVE_YASSL if HAVE_YASSL

1
mysys/Makefile.am
View File

@ -70,6 +70,7 @@ DEFS = -DDEFAULT_BASEDIR=\"$(prefix)\" \
-DSHAREDIR="\"$(MYSQLSHAREdir)\"" \ -DSHAREDIR="\"$(MYSQLSHAREdir)\"" \
-DDEFAULT_HOME_ENV=MYSQL_HOME \ -DDEFAULT_HOME_ENV=MYSQL_HOME \
-DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \ -DDEFAULT_GROUP_SUFFIX_ENV=MYSQL_GROUP_SUFFIX \
-DDEFAULT_SYSCONFDIR="\"$(sysconfdir)\"" \
@DEFS@ @DEFS@
libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@ libmysys_a_DEPENDENCIES= @THREAD_LOBJECTS@

10
mysys/default.c
View File

@ -48,7 +48,7 @@ char *defaults_extra_file=0;
/* Which directories are searched for options (and in which order) */ /* 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]; const char *default_directories[MAX_DEFAULT_DIRS + 1];
#ifdef __WIN__ #ifdef __WIN__
@ -959,11 +959,13 @@ static uint my_get_system_windows_directory(char *buffer, uint size)
4. getenv(DEFAULT_HOME_ENV) 4. getenv(DEFAULT_HOME_ENV)
5. Directory above where the executable is located 5. Directory above where the executable is located
6. "" 6. ""
7. --sysconfdir=<path>
On Novell NetWare, this is: On Novell NetWare, this is:
1. sys:/etc/ 1. sys:/etc/
2. getenv(DEFAULT_HOME_ENV) 2. getenv(DEFAULT_HOME_ENV)
3. "" 3. ""
4. --sysconfdir=<path>
On OS/2, this is: On OS/2, this is:
1. getenv(ETC) 1. getenv(ETC)
@ -971,12 +973,14 @@ static uint my_get_system_windows_directory(char *buffer, uint size)
3. getenv(DEFAULT_HOME_ENV) 3. getenv(DEFAULT_HOME_ENV)
4. "" 4. ""
5. "~/" 5. "~/"
6. --sysconfdir=<path>
Everywhere else, this is: Everywhere else, this is:
1. /etc/ 1. /etc/
2. getenv(DEFAULT_HOME_ENV) 2. getenv(DEFAULT_HOME_ENV)
3. "" 3. ""
4. "~/" 4. "~/"
5. --sysconfdir=<path>
*/ */
@ -1040,6 +1044,10 @@ static void init_default_directories()
} }
*ptr++= (char *)&config_dir; *ptr++= (char *)&config_dir;
} }
#endif
#ifdef DEFAULT_SYSCONFDIR
if (DEFAULT_SYSCONFDIR != "")
*ptr++= DEFAULT_SYSCONFDIR;
#endif #endif
*ptr= 0; /* end marker */ *ptr= 0; /* end marker */
} }