Changeset: 8d0e18ac8a8a for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=8d0e18ac8a8a
Modified Files:
monetdb5/mal/mal_parser.c
Branch: default
Log Message:
Added deleted lines from merge conflict
diffs (12 lines):
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
@@ -1116,6 +1116,8 @@ fcnHeader(Client cntxt, int kind)
cntxt->curprg = cntxt->backup;
return 0;
}
+ cntxt->curprg->def->errors = cntxt->backup->def->errors;
+ cntxt->backup->def->errors = 0;
curPrg = cntxt->curprg;
curBlk = curPrg->def;
curInstr = getInstrPtr(curBlk, 0);
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
