Changeset: 813ff78d8a15 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=813ff78d8a15
Modified Files:
monetdb5/optimizer/opt_pushselect.c
Branch: default
Log Message:
More defensive code.
diffs (17 lines):
diff --git a/monetdb5/optimizer/opt_pushselect.c
b/monetdb5/optimizer/opt_pushselect.c
--- a/monetdb5/optimizer/opt_pushselect.c
+++ b/monetdb5/optimizer/opt_pushselect.c
@@ -545,11 +545,11 @@ OPTpushselectImplementation(Client cntxt
int var = getArg(p, 1);
InstrPtr q = old[vars[var]];
- if (q->token == ASSIGNsymbol) {
+ if (q && q->token == ASSIGNsymbol) {
var = getArg(q, 1);
q = old[vars[var]];
}
- if (getModuleId(q) == sqlRef && getFunctionId(q) ==
deltaRef) {
+ if (q && getModuleId(q) == sqlRef && getFunctionId(q)
== deltaRef) {
InstrPtr r = copyInstruction(p);
InstrPtr s = copyInstruction(p);
InstrPtr t = copyInstruction(p);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
