MonetDB: default - Merge with Apr2011 branch.

[Sjoerd Mullender]

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

Merge with Apr2011 branch.


diffs (34 lines):

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