MonetDB: default - merging

[Niels Nes]

Changeset: fd1426eab81e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=fd1426eab81e
Modified Files:
        monetdb5/optimizer/opt_joinpath.c
Branch: default
Log Message:

merging


diffs (12 lines):

diff --git a/monetdb5/optimizer/opt_joinpath.c 
b/monetdb5/optimizer/opt_joinpath.c
--- a/monetdb5/optimizer/opt_joinpath.c
+++ b/monetdb5/optimizer/opt_joinpath.c
@@ -196,7 +196,7 @@ OPTjoinPathImplementation(Client cntxt, 
                         * This creates a series of join paths, many of which 
will be removed during deadcode elimination.
                         */
                        q= copyInstruction(p);
-                       q->argc=1;
+                       q->argc=p->retc;
                        for(j=p->retc; j<p->argc; j++){
                                r= getInstrPtr(mb,pc[getArg(p,j)]);
                                /*
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list