MonetDB: default - Merge with Jul2012 branch.

[Sjoerd Mullender]

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

Merge with Jul2012 branch.


diffs (21 lines):

diff --git a/gdk/gdk_heap.c b/gdk/gdk_heap.c
--- a/gdk/gdk_heap.c
+++ b/gdk/gdk_heap.c
@@ -158,7 +158,7 @@ HEAPcacheFind(size_t *maxsz, char *fn, s
                                /* resize file ? */
                                FILE *fp;
                                long_str fn;
-                               int mod = MMAP_READ | MMAP_WRITE | 
MMAP_SEQUENTIAL | MMAP_SYNC;
+
                                GDKfilepath(fn, HCDIR, e->fn, NULL);
 
                                if ((fp = fopen(fn, "rb+")) != NULL &&
@@ -174,7 +174,7 @@ HEAPcacheFind(size_t *maxsz, char *fn, s
                                   fputc('\n', fp) >= 0 &&
                                   fflush(fp) >= 0 &&
                                   fclose(fp) >= 0) {
-                                       void *base = GDKload(fn, NULL, *maxsz, 
*maxsz, mod);
+                                       void *base = GDKload(fn, NULL, *maxsz, 
*maxsz, STORE_MMAP);
                                        GDKmunmap(e->base, e->maxsz);
                                        e->base = base;
                                        e->maxsz = *maxsz;
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list