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

Modified Files:
      Tag: Nov2009
        sql.mx 
Log Message:
Keep track of the nonil property.


Index: sql.mx
===================================================================
RCS file: /cvsroot/monetdb/sql/src/backends/monet5/sql.mx,v
retrieving revision 1.358.2.3
retrieving revision 1.358.2.4
diff -u -d -r1.358.2.3 -r1.358.2.4
--- sql.mx      23 Oct 2009 12:01:21 -0000      1.358.2.3
+++ sql.mx      23 Oct 2009 12:15:44 -0000      1.358.2.4
@@ -3319,13 +3319,15 @@
        o = (@1*) Tloc(bn,BUNfirst(bn));
        p = (@2*) Tloc(b, BUNfirst(b));
        q = (@2*) Tloc(b, BUNlast(b));
+       bn->T->nonil= TRUE;
        if ( b->T->nonil){
                for (; p<q; p++)
                        *o = (@1) ((*p +  (*p<0)?-5:5) / scales[scale]);
        } else{
-               if (*p == @2_nil) 
+               if (*p == @2_nil) {
                        *o = @1_nil;
-               else
+                       bn->T->nonil= FALSE;
+               } else
                        *o = (@1) ((*p +  (*p<0)?-5:5) / scales[scale]);
        }
        BATsetcount(bn, BATcount(b));


------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Monetdb-sql-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-sql-checkins

Reply via email to