1998-08-30 15:57:34 +00:00
|
|
|
--- src/msql/config.c.orig Fri May 29 19:21:56 1998
|
|
|
|
+++ src/msql/config.c Fri Aug 28 17:14:21 1998
|
|
|
|
@@ -306,11 +306,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)
|
|
|
|
@@ -325,7 +325,7 @@
|
1997-07-14 12:37:08 +00:00
|
|
|
}
|
1997-07-14 12:35:19 +00:00
|
|
|
else
|
|
|
|
{
|
1998-02-13 10:54:49 +00:00
|
|
|
- snprintf(buf,sizeof(buf),"%s/msql.conf", INST_DIR);
|
|
|
|
+ snprintf(buf,sizeof(buf),"%s/etc/msql2/msql.conf", INST_DIR);
|
1997-07-14 12:35:19 +00:00
|
|
|
fp = fopen(buf,"r");
|
|
|
|
}
|
|
|
|
if (!fp)
|