From d29320b1a42f077eefd6c86423fbc92d3e2c2660 Mon Sep 17 00:00:00 2001 From: James FitzGibbon Date: Mon, 14 Jul 1997 12:40:41 +0000 Subject: Merge from msql-beta port as of 02/08/97 Remove broken (duplicated) patch-al file. Submitted by: Werner Griessl --- databases/msql/files/patch-ak | 28 ++++++++++++++-------------- 1 file changed, 14 insertions(+), 14 deletions(-) (limited to 'databases/msql/files/patch-ak') diff --git a/databases/msql/files/patch-ak b/databases/msql/files/patch-ak index 44c21d197497..cf94143ff3b7 100644 --- a/databases/msql/files/patch-ak +++ b/databases/msql/files/patch-ak @@ -1,6 +1,6 @@ -diff -ru src/msql/index.c /src/msql/index.c ---- src/msql/index.c Sun Jan 19 14:13:26 1997 -+++ /src/msql/index.c Sun Jan 19 14:14:06 1997 +diff -ruN src/msql/index.c src/msql/index.c +--- src/msql/index.c Fri Feb 7 10:06:42 1997 ++++ src/msql/index.c Fri Feb 7 10:17:04 1997 @@ -105,7 +105,7 @@ fd; @@ -19,21 +19,21 @@ diff -ru src/msql/index.c /src/msql/index.c curIndex->name); curIndex->tree = avlOpen(path); curIndex->buf = (char *)malloc(curIndex->length + 1); -diff -ru src/msql/msqld.c /src/msql/msqld.c ---- src/msql/msqld.c Sun Jan 19 14:13:26 1997 -+++ /src/msql/msqld.c Sun Jan 19 14:14:06 1997 -@@ -572,7 +572,7 @@ +diff -ruN src/msql/msqld.c src/msql/msqld.c +--- src/msql/msqld.c Fri Feb 7 10:06:42 1997 ++++ src/msql/msqld.c Fri Feb 7 10:16:49 1997 +@@ -577,7 +577,7 @@ /* ** Ensure that the correct user owns the database files */ -- sprintf(path,"%s/msqldb",msqlGetCharConf("inst_dir")); +- sprintf(path,"%s/msqldb",(char *)msqlGetCharConf("inst_dir")); + sprintf(path,"/var/db/msqldb"); if (stat(path,&sbuf) < 0) { printf("\nError! Can't stat '%s'\n\n",path); -diff -ru src/msql/msqldb.c /src/msql/msqldb.c ---- src/msql/msqldb.c Sun Jan 19 14:13:26 1997 -+++ /src/msql/msqldb.c Sun Jan 19 14:14:06 1997 +diff -ruN src/msql/msqldb.c src/msql/msqldb.c +--- src/msql/msqldb.c Fri Feb 7 10:06:42 1997 ++++ src/msql/msqldb.c Fri Feb 7 10:15:22 1997 @@ -126,7 +126,7 @@ #endif @@ -194,9 +194,9 @@ diff -ru src/msql/msqldb.c /src/msql/msqldb.c dirp = opendir(path); if (!dirp) { -diff -ru src/msql/table.c /src/msql/table.c ---- src/msql/table.c Sun Jan 19 14:13:27 1997 -+++ /src/msql/table.c Sun Jan 19 14:14:06 1997 +diff -ruN src/msql/table.c src/msql/table.c +--- src/msql/table.c Fri Feb 7 10:06:42 1997 ++++ src/msql/table.c Fri Feb 7 10:16:35 1997 @@ -100,7 +100,7 @@ { char path[MAXPATHLEN]; -- cgit v1.2.3