Changeset: 9f6b5a106ed9 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=9f6b5a106ed9
Modified Files:
Branch: default
Log Message:
merged Fabian' compilation fixes from Jun2010
diffs (45 lines):
diff -r 50bb5aca073b -r 9f6b5a106ed9
sql/src/backends/monet5/merovingian/merovingian.c
--- a/sql/src/backends/monet5/merovingian/merovingian.c Thu Jul 01 15:51:08
2010 +0200
+++ b/sql/src/backends/monet5/merovingian/merovingian.c Thu Jul 01 20:09:29
2010 +0200
@@ -427,7 +427,7 @@
FILE *cnf = NULL, *pidfile = NULL;
char buf[1024];
char bufu[1024];
- dpair d;
+ dpair d = NULL;
int pfd[2];
int retfd = -1;
pthread_t tid;
@@ -1010,15 +1010,14 @@
}
shutdown:
-
- /* we don't need merovingian itself */
- d = d->next;
-
/* stop started mservers */
- if (_mero_exit_timeout > 0) {
+ if (d != NULL && _mero_exit_timeout > 0) {
dpair t;
threadlist tl = NULL, tlw = tl;
+ /* we don't need merovingian itself */
+ d = d->next;
+
pthread_mutex_lock(&_mero_topdp_lock);
t = d;
while (t != NULL) {
@@ -1073,8 +1072,10 @@
/* remove files that suggest our existence */
unlink(".merovingian_lock");
- unlink(pidfilename);
- GDKfree(pidfilename);
+ if (pidfilename != NULL) {
+ unlink(pidfilename);
+ GDKfree(pidfilename);
+ }
/* mostly for valgrind... */
freeConfFile(_mero_props);
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list
