MonetDB: default - Merge from Dec2011 branch.

[Stefan Manegold]

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

Merge from Dec2011 branch.


diffs (14 lines):

diff --git a/monetdb5/optimizer/opt_joinpath.mx 
b/monetdb5/optimizer/opt_joinpath.mx
--- a/monetdb5/optimizer/opt_joinpath.mx
+++ b/monetdb5/optimizer/opt_joinpath.mx
@@ -668,7 +668,9 @@ ALGjoinPath(Client cntxt, MalBlkPtr mb, 
                bid = (int *) getArgReference(stk, pci, i);
                b = BATdescriptor(*bid);
                if (  b && top ) {
-                       if (TYPEerror(joins[top-1]->ttype, b->htype) ) {
+                       if ( !(joins[top-1]->ttype == b->htype) &&
+                            !(joins[top-1]->ttype == TYPE_void && b->htype == 
TYPE_oid) &&
+                            !(joins[top-1]->ttype == TYPE_oid && b->htype == 
TYPE_void) ) {
                                b= NULL;
                                error = 1;
                        }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list