1997-07-14 12:47:08 +00:00
|
|
|
--- src/msql/msqld.c.orig Mon Jul 7 01:27:28 1997
|
|
|
|
|
+++ src/msql/msqld.c Thu Jul 10 13:48:05 1997
|
|
|
|
|
@@ -593,7 +593,7 @@
|
1997-07-14 12:35:19 +00:00
|
|
|
|
|
|
|
|
if (*confFile == 0)
|
|
|
|
|
{
|
1998-02-13 10:54:49 +00:00
|
|
|
- snprintf(confFile,sizeof(confFile),"%s/msql.conf", INST_DIR);
|
|
|
|
|
+ snprintf(confFile,sizeof(confFile),"%s/etc/msql2/msql.conf", INST_DIR);
|
1997-07-14 12:35:19 +00:00
|
|
|
}
|
1997-07-14 12:47:08 +00:00
|
|
|
printf("\tLoading configuration from '%s'.\n",confFile);
|
1997-07-14 12:35:19 +00:00
|
|
|
msqlLoadConfigFile(confFile);
|
1998-02-13 10:54:49 +00:00
|
|
|
@@ -687,8 +687,7 @@
|
1997-07-14 12:47:08 +00:00
|
|
|
/*
|
|
|
|
|
** Ensure that the correct user owns the database files
|
|
|
|
|
*/
|
1998-02-13 10:54:49 +00:00
|
|
|
- snprintf(path,MAXPATHLEN, "%s/msqldb",
|
|
|
|
|
- (char *)msqlGetCharConf("general","inst_dir"));
|
|
|
|
|
+ strcpy(path, "/var/db/msqldb");
|
1997-07-14 12:47:08 +00:00
|
|
|
if (stat(path,&sbuf) < 0)
|
|
|
|
|
{
|
|
|
|
|
printf("\nError! Can't stat '%s'\n\n",path);
|
