MonetDB: default - Merge with Jun2016 branch.

[Sjoerd Mullender]

Changeset: 6c4257dd4a84 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6c4257dd4a84
Modified Files:
        monetdb5/modules/mal/tablet.c
Branch: default
Log Message:

Merge with Jun2016 branch.


diffs (13 lines):

diff --git a/monetdb5/modules/mal/tablet.c b/monetdb5/modules/mal/tablet.c
--- a/monetdb5/modules/mal/tablet.c
+++ b/monetdb5/modules/mal/tablet.c
@@ -1994,7 +1994,8 @@ SQLload_file(Client cntxt, Tablet *as, b
 #endif
        for (i = 0; i < as->nr_attrs; i++) {
                BAT *b = task->as->format[i].c;
-               BATsettrivprop(b);
+               if (b)
+                       BATsettrivprop(b);
                GDKfree(task->fields[i]);
        }
        GDKfree(task->fields);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list