Changeset: d4ba0f88f318 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d4ba0f88f318
Modified Files:
sql/backends/monet5/sql_gencode.c
sql/server/sql_mvc.c
Branch: default
Log Message:
Merge with Jan2014 branch.
diffs (63 lines):
diff --git a/sql/backends/monet5/sql_gencode.c
b/sql/backends/monet5/sql_gencode.c
--- a/sql/backends/monet5/sql_gencode.c
+++ b/sql/backends/monet5/sql_gencode.c
@@ -777,7 +777,7 @@ static int
return -1;
} else {
sql_subtype *st = tail_type(s);
- char *buf = GDKmalloc(MAXIDENTLEN);
+ char *buf;
int tt;
if (s->op3) {
@@ -788,6 +788,7 @@ static int
break;
}
tt = st->type->localtype;
+ buf = GDKmalloc(MAXIDENTLEN);
(void) snprintf(buf, MAXIDENTLEN,
"A%s", s->op1->op4.aval->data.val.sval);
q = newInstruction(mb, ASSIGNsymbol);
if (q == NULL)
@@ -801,12 +802,11 @@ static int
q->retc++;
}
} else {
- char *buf = GDKmalloc(SMALLBUFSIZ);
-
q = newAssignment(mb);
if (sql->mvc->argc &&
sql->mvc->args[s->flag]->varid >= 0) {
q = pushArgument(mb, q,
sql->mvc->args[s->flag]->varid);
} else {
+ char *buf = GDKmalloc(SMALLBUFSIZ);
(void) snprintf(buf, SMALLBUFSIZ,
"A%d", s->flag);
q = pushArgumentId(mb, q, buf);
}
@@ -2443,7 +2443,7 @@ static int
if (s->op2 && (r = _dumpstmt(sql, mb, s->op2)) < 0)
return -1;
if (!VAR_GLOBAL(s->flag)) { /* globals */
- char *buf = GDKmalloc(MAXIDENTLEN);
+ char *buf;
char *vn = atom2string(sql->mvc->sa,
s->op1->op4.aval);
if (!s->op2) {
@@ -2453,6 +2453,7 @@ static int
return -1;
break;
}
+ buf = GDKmalloc(MAXIDENTLEN);
(void) snprintf(buf, MAXIDENTLEN, "A%s", vn);
q = newInstruction(mb, ASSIGNsymbol);
if (q == NULL)
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
@@ -1247,7 +1247,7 @@ stack_set(mvc *sql, int var, char *name,
v->type.type = NULL;
if (type) {
int tpe = type->type->localtype;
- VALinit(&sql->vars[var].value, tpe, ATOMnil(tpe));
+ VALinit(&sql->vars[var].value, tpe, ATOMnilptr(tpe));
v->type = *type;
}
if (name)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
