MonetDB: default - Merge with Apr2011 branch.

[Sjoerd Mullender]

Changeset: cd10d5845ada for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=cd10d5845ada
Modified Files:
        MonetDB.spec
        NT/installer32/MonetDB-ODBC-Installer.vdproj
        NT/installer32/MonetDB5-Geom-Module.vdproj
        NT/installer32/MonetDB5-SQL-Installer.vdproj
        NT/installer64/MonetDB-ODBC-Installer.vdproj
        NT/installer64/MonetDB5-Geom-Module.vdproj
        NT/installer64/MonetDB5-SQL-Installer.vdproj
        NT/rules.msc
        clients/mapilib/mapi.rc
        clients/odbc/driver/driver.rc
        clients/odbc/winsetup/setup.rc
        configure.ag
        gdk/libbat.rc
        monetdb5/tools/libmonetdb5.rc
        template/configure.ag
        vertoo.data
Branch: default
Log Message:

Merge with Apr2011 branch.


diffs (22 lines):

diff --git a/gdk/gdk_batop.mx b/gdk/gdk_batop.mx
--- a/gdk/gdk_batop.mx
+++ b/gdk/gdk_batop.mx
@@ -1355,8 +1355,7 @@
        BUN cnt, i, r = 0, n, j;
        BUN *choice = NULL, *dst;
        BAT *bn;
-       BATiter bi1 = bat_iterator(b);
-       BATiter bi2 = bat_iterator(b);
+       BATiter bi = bat_iterator(b);
        BUN bun;
 
        BATcheck(b, "BATsample: source BAT required");
@@ -1446,7 +1445,7 @@
        for (j = 0; j < n; j++) {
                BUN p = bun + choice[j];
 
-               bunfastins(bn, BUNhead(bi1, p), BUNtail(bi2, p));
+               bunfastins(bn, BUNhead(bi, p), BUNtail(bi, p));
        }
        GDKfree(choice);        /* clean up choice array of BUN positions */
 
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list