25 lines
697 B
Text
25 lines
697 B
Text
--- src/msql/config.c.orig Thu Aug 19 07:33:13 1999
|
|
+++ src/msql/config.c Sat Jan 27 07:42:07 2001
|
|
@@ -344,11 +344,11 @@
|
|
msqlConfigLoaded = 1;
|
|
if (file)
|
|
{
|
|
- snprintf(buf,sizeof(buf),"%s/%s", INST_DIR, file);
|
|
+ snprintf(buf,sizeof(buf),"%s/etc/msql2/%s", INST_DIR, file);
|
|
fp = fopen(buf,"r");
|
|
if (!fp)
|
|
{
|
|
- snprintf(buf,sizeof(buf),"%s/%s.conf",INST_DIR,file);
|
|
+ snprintf(buf,sizeof(buf),"%s/etc/msql2/%s.conf",INST_DIR,file);
|
|
fp = fopen(buf,"r");
|
|
}
|
|
if (!fp)
|
|
@@ -385,7 +385,7 @@
|
|
#endif
|
|
|
|
#if defined(_OS_UNIX)
|
|
- snprintf(buf,sizeof(buf),"%s/msql.conf", INST_DIR);
|
|
+ snprintf(buf,sizeof(buf),"%s/etc/msql2/msql.conf", INST_DIR);
|
|
#endif
|
|
fp = fopen(buf,"r");
|
|
}
|