MonetDB: default - Merge with Feb2013 branch.

[Stefan Manegold]

Changeset: e2aef4af6ffb for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=e2aef4af6ffb
Modified Files:
        monetdb5/extras/jaql/jaqlscenario.c
Branch: default
Log Message:

Merge with Feb2013 branch.


diffs (20 lines):

diff --git a/monetdb5/extras/jaql/jaqlscenario.c 
b/monetdb5/extras/jaql/jaqlscenario.c
--- a/monetdb5/extras/jaql/jaqlscenario.c
+++ b/monetdb5/extras/jaql/jaqlscenario.c
@@ -194,6 +194,7 @@ JAQLparser(Client c)
        j->scanstreameof = 0;
        j->pos = 0;
        j->p = NULL;
+       j->time = 0;
        j->timing.parse = j->timing.optimise = j->timing.gencode = 0L;
 
        j->timing.parse = GDKusec();
@@ -244,7 +245,7 @@ JAQLparser(Client c)
                if (prg->def->errors) {
                        /* this is bad already, so let's try to make it 
debuggable */
                        mnstr_printf(out, "!jaqlgencode: generated program 
contains errors\n");
-                       printFunction(out, c->curprg->def, 0, LIST_MAPI);
+                       printFunction(out, prg->def, 0, LIST_MAPI);
                        
                        /* restore the state */
                        MSresetInstructions(prg->def, oldstop);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list