Changeset: 5f1202c3c406 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5f1202c3c406
Branch: default
Log Message:
Merge heads.
diffs (36 lines):
diff --git a/sql/backends/monet5/sql_result.c b/sql/backends/monet5/sql_result.c
--- a/sql/backends/monet5/sql_result.c
+++ b/sql/backends/monet5/sql_result.c
@@ -876,9 +876,9 @@ create_prepare_result(backend *b, cq *q,
BAT* order = NULL;
node *n;
- const size_t nr_columns = b->client->protocol == PROTOCOL_COLUMNAR? 7 :
6;
+ const int nr_columns = b->client->protocol == PROTOCOL_COLUMNAR? 7 : 6;
- size_t len1 = 0, len4 = 0, len5 = 0, len6 = 0, len7 =0; /* column
widths */
+ int len1 = 0, len4 = 0, len5 = 0, len6 = 0, len7 =0; /* column
widths */
int len2 = 1, len3 = 1;
sql_arg *a;
sql_subtype *t;
@@ -893,7 +893,7 @@ create_prepare_result(backend *b, cq *q,
for (n = r->exps->h; n; n = n->next) {
const char *name = NULL, *rname = NULL, *schema = NULL;
sql_exp *e = n->data;
- size_t slen;
+ int slen;
t = exp_subtype(e);
slen = strlen(t->type->base.name);
diff --git a/tools/monetdbe/monetdbe.c b/tools/monetdbe/monetdbe.c
--- a/tools/monetdbe/monetdbe.c
+++ b/tools/monetdbe/monetdbe.c
@@ -1100,7 +1100,7 @@ monetdbe_set_remote_results(backend *be,
BBPunfix(order->batCacheid);
if (error) {
- res_table_destroy(be->results);
+ res_tables_destroy(be->results);
return error;
}
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
