MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

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

Merge with Oct2010 branch.


diffs (12 lines):

diff -r 71ae85872c34 -r fdea8523f81f MonetDB/src/gdk/gdk_storage.mx
--- a/MonetDB/src/gdk/gdk_storage.mx    Sat Oct 09 14:48:56 2010 +0200
+++ b/MonetDB/src/gdk/gdk_storage.mx    Sat Oct 09 15:36:11 2010 +0200
@@ -755,7 +755,7 @@
                                          alignedsz >> 20, advice, errno);
                }
        }
-       if (touch && preload > 0) {
+       if (touch && preload > 0 && adv != MMAP_DONTNEED) {
                /* we need to ensure alignment, here, as b might be a
                   view and heap.base of views are not necessarily
                   aligned */
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list