Update of /cvsroot/monetdb/MonetDB4/src/modules/plain
In directory sc8-pr-cvs16.sourceforge.net:/tmp/cvs-serv11995/src/modules/plain

Modified Files:
      Tag: GDK-2
        upgrade.mx xtables.mx 
Log Message:
propagated changes of Monday Sep 03 2007 - Thursday Sep 06 2007
from the development trunk to the GDK-2 branch


Index: upgrade.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/plain/upgrade.mx,v
retrieving revision 1.4
retrieving revision 1.4.4.1
diff -u -d -r1.4 -r1.4.4.1
--- upgrade.mx  19 Apr 2007 01:48:31 -0000      1.4
+++ upgrade.mx  6 Sep 2007 13:50:24 -0000       1.4.4.1
@@ -355,7 +355,10 @@
        }
        buf = GDKmalloc(64*BUFSIZ);
        while( (res = fread(buf, 1, 64*BUFSIZ, srcfp)) > 0) {
-               fwrite(buf, 1, res, dstfp);
+               if (fwrite(buf, 1, res, dstfp) < res) {
+                       GDKerror("error writing %s\n", dstpath);
+                       return -1;
+               }
                if (res < (64*BUFSIZ))
                        break;
        }

Index: xtables.mx
===================================================================
RCS file: /cvsroot/monetdb/MonetDB4/src/modules/plain/xtables.mx,v
retrieving revision 1.3.4.6
retrieving revision 1.3.4.7
diff -u -d -r1.3.4.6 -r1.3.4.7
--- xtables.mx  15 Aug 2007 09:37:31 -0000      1.3.4.6
+++ xtables.mx  6 Sep 2007 13:50:25 -0000       1.3.4.7
@@ -659,7 +659,6 @@
        }
        if (BATcount(histo) == BATcount(bn)) {
                BATkey(BATmirror(bn),TRUE);
-               BATkey(BATmirror(histo),TRUE);
        }
        ALIGNsetH(bn, b);
        return grp_new(g, bn, histo);


-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems?  Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >>  http://get.splunk.com/
_______________________________________________
Monetdb-checkins mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/monetdb-checkins

Reply via email to