Changeset: 5241820ae29c for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=5241820ae29c
Modified Files:
monetdb5/optimizer/opt_support.c
sql/backends/monet5/sql_scenario.c
sql/server/rel_exp.c
Branch: Dec2016
Log Message:
Merge.
diffs (40 lines):
diff --git a/monetdb5/optimizer/opt_support.c b/monetdb5/optimizer/opt_support.c
--- a/monetdb5/optimizer/opt_support.c
+++ b/monetdb5/optimizer/opt_support.c
@@ -146,9 +146,10 @@ optimizeMALBlock(Client cntxt, MalBlkPtr
msg = (str) (*p->fcn) (cntxt, mb, 0, p);
if (msg) {
str place = getExceptionPlace(msg);
- msg=
createException(getExceptionType(msg), place, "%s", getExceptionMessage(msg));
+ str nmsg=
createException(getExceptionType(msg), place, "%s", getExceptionMessage(msg));
GDKfree(place);
- return msg;
+ GDKfree(msg);
+ return nmsg;
}
pc= -1;
}
diff --git a/sql/backends/monet5/sql_scenario.c
b/sql/backends/monet5/sql_scenario.c
--- a/sql/backends/monet5/sql_scenario.c
+++ b/sql/backends/monet5/sql_scenario.c
@@ -1148,7 +1148,7 @@ SQLparser(Client c)
/* in case we had produced a non-cachable plan, the optimizer
should be called */
if (opt ) {
- str msg = SQLoptimizeQuery(c, c->curprg->def);
+ msg = SQLoptimizeQuery(c, c->curprg->def);
if (msg != MAL_SUCCEED) {
sqlcleanup(m, err);
diff --git a/sql/server/rel_exp.c b/sql/server/rel_exp.c
--- a/sql/server/rel_exp.c
+++ b/sql/server/rel_exp.c
@@ -317,7 +317,7 @@ exp_atom_flt(sql_allocator *sa, flt f)
{
sql_subtype it;
- sql_find_subtype(&it, "double", 24, 0);
+ sql_find_subtype(&it, "real", 24, 0);
return exp_atom(sa, atom_float(sa, &it, (dbl)f ));
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
