MonetDB: default - Merge with Oct2010 branch.

[Sjoerd Mullender]

Changeset: 38c43f30e98e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=38c43f30e98e
Modified Files:
        
Branch: default
Log Message:

Merge with Oct2010 branch.


diffs (19 lines):

diff -r 19ecd90eeebd -r 38c43f30e98e MonetDB/src/gdk/gdk_logger.mx
--- a/MonetDB/src/gdk/gdk_logger.mx     Fri Sep 03 17:32:04 2010 +0200
+++ b/MonetDB/src/gdk/gdk_logger.mx     Mon Sep 06 10:13:40 2010 +0200
@@ -1008,13 +1008,13 @@
        BUN p, q;
        /* using alloca, since the old TMsubcommit interface also uses
           alloca */
-       bat *n = alloca(sizeof(bat) * (1 + BATcount(list) * 2 + (extra ? 
BATcount(extra) : 0)));
+       bat *n = alloca(sizeof(bat) * (2 + BATcount(list) * 2 + (extra ? 
BATcount(extra) : 0)));
        int i = 0;
        BAT *b = list;
        BATiter bi = bat_iterator(b);
        int res;
 
-       n[i++] = 0;
+       n[i++] = 0;             /* n[0] is not used */
 
        /* first loop over deleted then over current and new */
        for (p = b->batDeleted; p < b->batFirst; p++) {
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list