MonetDB: default - Merge with Oct2012 branch.

[Sjoerd Mullender]

Changeset: 1d346219126c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1d346219126c
Modified Files:
        gdk/gdk_storage.c
Branch: default
Log Message:

Merge with Oct2012 branch.


diffs (12 lines):

diff --git a/gdk/gdk_storage.c b/gdk/gdk_storage.c
--- a/gdk/gdk_storage.c
+++ b/gdk/gdk_storage.c
@@ -372,7 +372,7 @@ GDKload(const char *nme, const char *ext
 #endif
                      fputc('\n', fp) >= 0 &&
                      fflush(fp) >= 0))) {
-                       if (fclose(fp) >= 0) {
+                       if (fp == NULL || fclose(fp) >= 0) {
                                int mod = MMAP_READ | MMAP_WRITE | 
MMAP_SEQUENTIAL | MMAP_SYNC;
 
                                if (mode == STORE_PRIV)
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list