Changeset: 1a231e193164 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=1a231e193164
Modified Files:
gdk/gdk_batop.c
monetdb5/mal/mal_parser.c
Branch: trails
Log Message:
Merged with default
diffs (34 lines):
diff --git a/gdk/gdk_batop.c b/gdk/gdk_batop.c
--- a/gdk/gdk_batop.c
+++ b/gdk/gdk_batop.c
@@ -1282,9 +1282,10 @@ BATsort(BAT **sorted, BAT **order, BAT *
}
assert(reverse == 0 || reverse == 1);
assert(stable == 0 || stable == 1);
- if (sorted == NULL && order == NULL && groups == NULL) {
+ if (sorted == NULL && order == NULL) {
/* no place to put result, so we're done quickly */
- return GDK_SUCCEED;
+ GDKerror("BATsort: no place to put the result.\n");
+ return GDK_FAIL;
}
if (g == NULL && !stable) {
/* pre-ordering doesn't make sense if we're not
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
@@ -1712,8 +1712,13 @@ part2: /* consume <operator><term> part
}
part3:
skipSpace(cntxt);
- if (currChar(cntxt) != ';')
+ if (currChar(cntxt) != ';') {
parseError(cntxt, "';' expected\n");
+ skipToEnd(cntxt);
+ pushInstruction(curBlk, curInstr);
+ return;
+ }
+ skipToEnd(cntxt);
pushInstruction(curBlk, curInstr);
if (cntrl == RETURNsymbol && !(curInstr->token == ASSIGNsymbol ||
getModuleId(curInstr) != 0))
parseError(cntxt, "return assignment expected\n");
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
