MonetDB: Jun2010 - fix crash with prepare statement

[Niels Nes]

Changeset: 6a21956b2fd1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=6a21956b2fd1
Modified Files:
        sql/src/server/rel_select.mx
Branch: Jun2010
Log Message:

fix crash with prepare statement


diffs (20 lines):

diff -r 22ab36b7873b -r 6a21956b2fd1 sql/src/server/rel_select.mx
--- a/sql/src/server/rel_select.mx      Tue Jun 01 11:51:17 2010 +0200
+++ b/sql/src/server/rel_select.mx      Thu Jun 03 22:25:12 2010 +0200
@@ -3101,7 +3101,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);
 
@@ -3148,7 +3147,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