Changeset: 15db8da092bc for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=15db8da092bc
Modified Files:
sql/server/rel_psm.c
sql/storage/store.c
Branch: Jun2016
Log Message:
more leak fixing
diffs (35 lines):
diff --git a/sql/server/rel_psm.c b/sql/server/rel_psm.c
--- a/sql/server/rel_psm.c
+++ b/sql/server/rel_psm.c
@@ -842,8 +842,8 @@ rel_create_func(mvc *sql, dlist *qname,
sql_func *f = sf->func;
if (!f->mod || strcmp(f->mod, fmod))
f->mod = _STRDUP(fmod);
- if (!f->imp || strcmp(f->imp, fnme))
- f->imp = _STRDUP(fnme);
+ if (!f->imp || strcmp(f->imp, fnme))
+ f->imp =
(f->sa)?sa_strdup(f->sa, fnme):_STRDUP(fnme);
f->sql = 0; /* native */
f->lang = FUNC_LANG_INT;
}
diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -777,7 +777,8 @@ load_func(sql_trans *tr, sql_schema *s,
t->res = NULL;
t->s = s;
t->fix_scale = SCALE_EQ;
- if (t->lang != FUNC_LANG_INT) {
+ t->sa = tr->sa;
+ if (t->lang != FUNC_LANG_INT) {
t->query = t->imp;
t->imp = NULL;
}
@@ -2418,6 +2419,7 @@ func_dup(sql_trans *tr, int flag, sql_fu
list_append(f->res, arg_dup(sa, n->data));
}
f->s = s;
+ f->sa = sa;
return f;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
