MonetDB: default - merged with Oct2014

[Niels Nes]

Changeset: cb01027b8c86 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cb01027b8c86
Modified Files:
        sql/backends/monet5/sql_gencode.c
Branch: default
Log Message:

merged with Oct2014


diffs (40 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
@@ -331,6 +331,7 @@ static int
        InstrPtr curInstr = 0;
        Symbol backup = NULL;
        stmt *s;
+       int old_argc = be->mvc->argc;
 
        r = rel_optimizer(m, rel);
        s = rel_bin(m, r);
@@ -365,7 +366,7 @@ static int
                        sql_subtype *t = tail_type(op);
                        int type = t->type->localtype;
                        int varid = 0;
-                       char *nme = op->op3->op4.aval->data.val.sval;
+                       char *nme = 
(op->op3)?op->op3->op4.aval->data.val.sval:op->cname;
 
                        varid = newVariable(curBlk, _STRDUP(nme), type);
                        curInstr = pushArgument(curBlk, curInstr, varid);
@@ -374,8 +375,10 @@ static int
                }
        }
 
+       be->mvc->argc = 0;
        if (backend_dumpstmt(be, curBlk, s, 0) < 0)
                return -1;
+       be->mvc->argc = old_argc;
        /* SQL function definitions meant for inlineing should not be optimized 
before */
        varSetProp(curBlk, getArg(curInstr, 0), sqlfunctionProp, op_eq, NULL);
        addQueryToCache(c);
@@ -431,7 +434,7 @@ static int
                        sql_subtype *t = tail_type(op);
                        int type = t->type->localtype;
                        int varid = 0;
-                       char *nme = op->op3->op4.aval->data.val.sval;
+                       char *nme = 
(op->op3)?op->op3->op4.aval->data.val.sval:op->cname;
 
                        varid = newVariable(curBlk, _STRDUP(nme), type);
                        curInstr = pushArgument(curBlk, curInstr, varid);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list