2001-01-27 09:55:25 +01:00
|
|
|
--- 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 @@
|
1998-08-30 17:57:34 +02:00
|
|
|
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)
|
2001-01-27 09:55:25 +01:00
|
|
|
@@ -385,7 +385,7 @@
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if defined(_OS_UNIX)
|
1998-02-13 11:54:49 +01:00
|
|
|
- snprintf(buf,sizeof(buf),"%s/msql.conf", INST_DIR);
|
|
|
|
+ snprintf(buf,sizeof(buf),"%s/etc/msql2/msql.conf", INST_DIR);
|
2001-01-27 09:55:25 +01:00
|
|
|
#endif
|
1997-07-14 14:35:19 +02:00
|
|
|
fp = fopen(buf,"r");
|
|
|
|
}
|