MonetDB: headless - Merge with default branch.

[Sjoerd Mullender]

Changeset: 295cc17bd32e for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=295cc17bd32e
Modified Files:
        gdk/gdk_col.c
Branch: headless
Log Message:

Merge with default branch.


diffs (29 lines):

diff --git a/gdk/gdk_col.c b/gdk/gdk_col.c
--- a/gdk/gdk_col.c
+++ b/gdk/gdk_col.c
@@ -1152,6 +1152,7 @@
                if (p != last) {
                        unsigned short hs = size(b);
                        char *htmp = alloca(hs);
+                       BATiter bi2 = bat_iterator(b);
 
                        if (b->hash) {
                                HASHmove(b->hash, last, p, BUNhead(bi, last), 
last < last);
@@ -1173,7 +1174,7 @@
                           if p+1==last, the new value is now the
                           last, so no comparison is needed. */
                        if (b->sorted & 1) {
-                               if (p + 1 < last && ATOMcmp(b->type, 
BUNhead(bi, p), BUNhead(bi, p + 1)) > 0) {
+                               if (p + 1 < last && ATOMcmp(b->type, 
BUNhead(bi, p), BUNhead(bi2, p + 1)) > 0) {
                                        b->sorted = FALSE;
                                        b->nosorted = p;
                                }
@@ -1182,7 +1183,7 @@
                                        b->nodense = p;
                                }
                        } else if (b->sorted == (bit) GDK_SORTED_REV) {
-                               if (p + 1 < last && ATOMcmp(b->type, 
BUNhead(bi, p), BUNhead(bi, p + 1)) < 0) {
+                               if (p + 1 < last && ATOMcmp(b->type, 
BUNhead(bi, p), BUNhead(bi2, p + 1)) < 0) {
                                        b->sorted = FALSE;
                                        b->nosorted_rev = p;
                                }
_______________________________________________
Checkin-list mailing list
Checkin-list@monetdb.org
http://mail.monetdb.org/mailman/listinfo/checkin-list