Changeset: 0d8ec372d982 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=0d8ec372d982
Modified Files:
sql/server/sql_mvc.c
Branch: default
Log Message:
merged
diffs (28 lines):
diff --git a/sql/server/sql_mvc.c b/sql/server/sql_mvc.c
--- a/sql/server/sql_mvc.c
+++ b/sql/server/sql_mvc.c
@@ -1246,13 +1246,15 @@ mvc_is_sorted(mvc *m, sql_column *col)
void
stack_push_var(mvc *sql, char *name, sql_subtype *type)
{
+ int tpe = type->type->localtype;
+
if (sql->topvars == sql->sizevars) {
sql->sizevars <<= 1;
sql->vars = RENEW_ARRAY(sql_var,sql->vars,sql->sizevars);
}
sql->vars[sql->topvars].s = (void*)1;
sql->vars[sql->topvars].name = _STRDUP(name);
- sql->vars[sql->topvars].value.vtype = 0;
+ VALinit(&sql->vars[sql->topvars].value, tpe, ATOMnil(tpe));
sql->vars[sql->topvars].type = *type;
assert(sql->vars[sql->topvars].type.comp_type == NULL);
sql->vars[sql->topvars].view = 0;
@@ -1270,6 +1272,7 @@ stack_push_rel_var(mvc *sql, char *name,
sql->vars[sql->topvars].name = _STRDUP(name);
sql->vars[sql->topvars].value.vtype = 0;
sql->vars[sql->topvars].type = *type;
+
assert(sql->vars[sql->topvars].type.comp_type != NULL);
sql->vars[sql->topvars].view = 0;
sql->topvars++;
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
