Update of /cvsroot/monetdb/sql/src/backends/monet5
In directory 23jxhf1.ch3.sourceforge.com:/tmp/cvs-serv3670/src/backends/monet5

Modified Files:
        sql.mx 
Log Message:
fix windos compilation (use proper BUN type)
introduced rel_subquery, which wraps the calls made to handle subqueries
from updates and psm, and switches between relational and binary version.
Once finished it should make the algebra version handle all queries.



U sql.mx
Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.291
retrieving revision 1.292
diff -u -d -r1.291 -r1.292
--- sql.mx      28 Oct 2008 21:45:07 -0000      1.291
+++ sql.mx      2 Nov 2008 10:42:30 -0000       1.292
@@ -984,7 +984,7 @@
                                c->emode = m_inplace;
                                rel_print(c, r, 0);
                        }
-                       s = rel_bin(c, r);
+                       s = output_rel_bin(c, r);
                        if (s) {
                                stmt *opt;
 
@@ -2164,7 +2164,7 @@
                }
                if (first)
                        rh--;
-               BATsetcount(bn, rh - rf); 
+               BATsetcount(bn, (BUN)(rh - rf)); 
        } else {
                oid *rf, *rh, *rt;
                oid *h = (oid*)Hloc(b,0), *vp, *ve;
@@ -2184,7 +2184,7 @@
                                *rt++ = *vp;
                        }
                }
-               BATsetcount(bn, rh - rf); 
+               BATsetcount(bn, (BUN)(rh - rf)); 
        }
        BBPunfix(b->batCacheid);
        BBPkeepref(*ret = bn->batCacheid);


-------------------------------------------------------------------------
This SF.Net email is sponsored by the Moblin Your Move Developer's challenge
Build the coolest Linux based applications with Moblin SDK & win great prizes
Grand prize is a trip for two to an Open Source event anywhere in the world
http://moblin-contest.org/redirect.php?banner_id=100&url=/
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to