Changeset: 8a5c94f08733 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8a5c94f08733
Modified Files:
gdk/gdk_group.c
sql/backends/monet5/rel_bin.c
sql/server/rel_updates.c
Branch: Nov2019
Log Message:
Merge with Apr2019 branch
diffs (37 lines):
diff --git a/gdk/gdk_group.c b/gdk/gdk_group.c
--- a/gdk/gdk_group.c
+++ b/gdk/gdk_group.c
@@ -713,8 +713,7 @@ BATgroup_internal(BAT **groups, BAT **ex
maxgrps += BATcount(h);
if (maxgrps < GROUPBATINCR)
maxgrps = GROUPBATINCR;
- if (b->twidth <= 2 &&
- maxgrps > ((BUN) 1 << (8 << (b->twidth == 2))))
+ if (b->twidth <= 2)
maxgrps = (BUN) 1 << (8 << (b->twidth == 2));
if (extents) {
en = COLnew(0, TYPE_oid, maxgrps, TRANSIENT);
diff --git a/sql/backends/monet5/rel_bin.c b/sql/backends/monet5/rel_bin.c
--- a/sql/backends/monet5/rel_bin.c
+++ b/sql/backends/monet5/rel_bin.c
@@ -1293,6 +1293,8 @@ rel_parse_value(backend *be, char *query
bstream_destroy(m->scanner.rs);
m->sym = NULL;
+ o.vars = m->vars; /* may have been realloc'ed */
+ o.sizevars = m->sizevars;
if (m->session->status || m->errstr[0]) {
int status = m->session->status;
char errstr[ERRSIZE];
diff --git a/sql/server/rel_updates.c b/sql/server/rel_updates.c
--- a/sql/server/rel_updates.c
+++ b/sql/server/rel_updates.c
@@ -2204,6 +2204,8 @@ rel_parse_val(mvc *m, char *query, char
bstream_destroy(m->scanner.rs);
m->sym = NULL;
+ o.vars = m->vars; /* may have been realloc'ed */
+ o.sizevars = m->sizevars;
if (m->session->status || m->errstr[0]) {
int status = m->session->status;
char errstr[ERRSIZE];
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
