MonetDB: malparsing - Minor fixes

[Martin Kersten]

Changeset: 18c3dc3d5cf1 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=18c3dc3d5cf1
Modified Files:
        monetdb5/mal/mal_import.c
        monetdb5/mal/mal_parser.c
Branch: malparsing
Log Message:

Minor fixes


diffs (25 lines):

diff --git a/monetdb5/mal/mal_import.c b/monetdb5/mal/mal_import.c
--- a/monetdb5/mal/mal_import.c
+++ b/monetdb5/mal/mal_import.c
@@ -231,7 +231,7 @@ callString(Client cntxt, str s)
        Client c;
        str msg = MAL_SUCCEED;
 
-       c = MCinitClient((oid)0,0,cntxt->fdout);
+       c = MCinitClient((oid)0,cntxt->fdin,cntxt->fdout);
        msg = compileString(c,s);
        if( msg == MAL_SUCCEED)
                runMAL(c, c->curprg->def,0,0);
diff --git a/monetdb5/mal/mal_parser.c b/monetdb5/mal/mal_parser.c
--- a/monetdb5/mal/mal_parser.c
+++ b/monetdb5/mal/mal_parser.c
@@ -1345,8 +1345,7 @@ parseStatement(Client cntxt, int cntrl)
                        l = idLength(cntxt);
                        if (l == 0 ) {
                                parseError(cntxt, "<identifier> expected\n");
-                               freeInstruction(curInstr);
-                               return;
+                               goto part3;
                        }
                        GETvariable;
                        if (*cntxt->lineptr == ':') {
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list