MonetDB: malerrors - Minor fixes

[Martin Kersten]

Changeset: 900ad3391e18 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=900ad3391e18
Modified Files:
        monetdb5/mal/mal_instruction.c
        sql/backends/monet5/sql_gencode.c
        sql/backends/monet5/sql_gencode.h
        sql/server/rel_optimizer.c
Branch: malerrors
Log Message:

Minor fixes


diffs (53 lines):

diff --git a/monetdb5/mal/mal_instruction.c b/monetdb5/mal/mal_instruction.c
--- a/monetdb5/mal/mal_instruction.c
+++ b/monetdb5/mal/mal_instruction.c
@@ -929,7 +929,7 @@ trimMalVariables(MalBlkPtr mb, MalStkPtr
        InstrPtr q;
 
        /* reset the use bit for all non-signature arguments */
-       for (i = 1; i < mb->vtop; i++) 
+       for (i = 0; i < mb->vtop; i++) 
                clrVarUsed(mb,i);
        /* the return variable is also 'used' */
        //i = findVariable(mb, getFunctionId(mb->stmt[0]));
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
@@ -1031,15 +1031,6 @@ backend_create_subaggr(backend *be, sql_
 }
 
 void
-_rel_print(mvc *sql, sql_rel *rel) 
-{
-       list *refs = sa_list(sql->sa);
-       rel_print_refs(sql, GDKstdout, rel, 0, refs, 1);
-       rel_print_(sql, GDKstdout, rel, 0, refs, 1);
-       mnstr_printf(GDKstdout, "\n");
-}
-
-void
 rel_print(mvc *sql, sql_rel *rel, int depth) 
 {
        list *refs = sa_list(sql->sa);
diff --git a/sql/backends/monet5/sql_gencode.h 
b/sql/backends/monet5/sql_gencode.h
--- a/sql/backends/monet5/sql_gencode.h
+++ b/sql/backends/monet5/sql_gencode.h
@@ -30,7 +30,6 @@ extern int backend_create_subaggr(backen
 sql5_export int monet5_create_relational_function(mvc *m, const char *mod, 
const char *name, sql_rel *rel, stmt *call, list *rel_ops, int inline_func);
 
 extern void rel_print(mvc *sql, sql_rel *rel, int depth);
-extern void _rel_print(mvc *sql, sql_rel *rel);
 
 extern int constantAtom(backend *be, MalBlkPtr mb, atom *a);
 extern InstrPtr table_func_create_result(MalBlkPtr mb, InstrPtr q, sql_func 
*f, list *restypes);
diff --git a/sql/server/rel_optimizer.c b/sql/server/rel_optimizer.c
--- a/sql/server/rel_optimizer.c
+++ b/sql/server/rel_optimizer.c
@@ -8299,7 +8299,6 @@ exps_from_rel( list *exps, sql_rel *rel 
 }
 
 
-extern void _rel_print(mvc *sql, sql_rel *rel);
 
 static sql_rel *
 rel_apply(mvc *sql, sql_rel *l, sql_rel *r, list *exps, int flag)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list