Changeset: 14608e0d8abd for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=14608e0d8abd
Modified Files:
clients/Tests/exports.stable.out
gdk/gdk_bat.c
gdk/gdk_batop.c
gdk/gdk_bbp.c
gdk/gdk_group.c
gdk/gdk_join.c
gdk/gdk_logger.c
gdk/gdk_unique.c
gdk/gdk_utils.c
monetdb5/mal/mal_import.c
monetdb5/modules/mal/wlc.c
monetdb5/modules/mal/wlc.h
sql/backends/monet5/wlr.c
Branch: default
Log Message:
Merge with Apr2019
diffs (24 lines):
diff --git a/clients/Tests/exports.stable.out b/clients/Tests/exports.stable.out
--- a/clients/Tests/exports.stable.out
+++ b/clients/Tests/exports.stable.out
@@ -1908,7 +1908,7 @@ str WLCinit(void);
str WLCinitCmd(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCmaster(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
str WLCquery(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
-void WLCreadConfig(FILE *fd);
+str WLCreadConfig(FILE *fd);
void WLCreset(void);
str WLCrollback(int clientid);
str WLCrollbackCmd(Client cntxt, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci);
diff --git a/gdk/gdk_unique.c b/gdk/gdk_unique.c
--- a/gdk/gdk_unique.c
+++ b/gdk/gdk_unique.c
@@ -318,7 +318,7 @@ BATunique(BAT *b, BAT *s)
}
len = snprintf(hs->heap.filename, sizeof(hs->heap.filename),
"%s.hash%d", nme, THRgettid());
if (len == -1 || len >= (int) sizeof(hs->heap.filename) ||
- HASHnew(hs, b->ttype, BUNlast(b), mask, BUN_NONE) !=
GDK_SUCCEED) {
+ HASHnew(hs, b->ttype, BUNlast(b), mask, BUN_NONE) !=
GDK_SUCCEED) {
GDKfree(hs);
hs = NULL;
GDKerror("BATunique: cannot allocate hash table\n");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
