Changeset: 68a4ee44bdf2 for MonetDB URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=68a4ee44bdf2 Modified Files: sql/src/server/rel_select.mx Branch: Feb2010 Log Message:
back-ported Niels' "fix crash with prepare statement" (bug #2549) from Jun2010 to Feb2010 (`hg diff -c 6a21956b2fd1 | hg import --no-commit -`) diffs (20 lines): diff -r 4f256fddbcb8 -r 68a4ee44bdf2 sql/src/server/rel_select.mx --- a/sql/src/server/rel_select.mx Wed Jun 02 16:33:27 2010 +0200 +++ b/sql/src/server/rel_select.mx Fri Jun 04 00:23:50 2010 +0200 @@ -3026,7 +3026,6 @@ } return exp_binop(l, r, f); } else { - int digits = t1->digits + t2->digits; sql_exp *ol = exp_dup(l); sql_exp *or = exp_dup(r); @@ -3073,7 +3072,7 @@ } else if (f->func->fix_scale == SCALE_MUL) { l = exp_sum_scales(sql, f, l, r); } else if (f->func->fix_scale == DIGITS_ADD) { - f->res.digits = digits; + f->res.digits = t1->digits + t2->digits; } exp_destroy(ol); exp_destroy(or); _______________________________________________ Checkin-list mailing list Checkin-list@monetdb.org http://mail.monetdb.org/mailman/listinfo/checkin-list