Changeset: 4debb62abee5 for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=4debb62abee5
Modified Files:
monetdb5/modules/kernel/algebra.mx
Branch: default
Log Message:
Merge from Jul2012 branch.
diffs (33 lines):
diff --git a/monetdb5/modules/kernel/algebra.mx
b/monetdb5/modules/kernel/algebra.mx
--- a/monetdb5/modules/kernel/algebra.mx
+++ b/monetdb5/modules/kernel/algebra.mx
@@ -1744,16 +1744,16 @@ CMDlike(BAT **ret, BAT *b, str s)
BATaccessBegin(b,USE_HEAD|USE_TAIL,MMAP_SEQUENTIAL);
if (b->hvarsized) {
BATloop(b, u, v)
- if (like(BUNtvar(bi, u), t, yy))
- if (BUNfastins(c, BUNhvar(bi, u), BUNtvar(bi, u)) ==
NULL) {
+ if (like(BUNtvar(bi, u), t, yy) &&
+ BUNfastins(c, BUNhvar(bi, u), BUNtvar(bi, u))
== NULL) {
BBPreclaim(c);
GDKfree(t);
return GDK_FAIL;
}
} else {
BATloop(b, u, v)
- if (like(BUNtvar(bi, u), t, yy))
- if (BUNfastins(c, BUNhloc(bi, u), BUNtvar(bi, u)) ==
NULL) {
+ if (like(BUNtvar(bi, u), t, yy) &&
+ BUNfastins(c, BUNhloc(bi, u), BUNtvar(bi, u))
== NULL) {
BBPreclaim(c);
GDKfree(t);
return GDK_FAIL;
@@ -1761,7 +1761,7 @@ CMDlike(BAT **ret, BAT *b, str s)
}
BATaccessEnd(b,USE_HEAD|USE_TAIL,MMAP_SEQUENTIAL);
c->hsorted = BAThordered(b);
- c->hrevsorted = BAThordered(b);
+ c->hrevsorted = BAThrevordered(b);
c->tsorted = BATtordered(b);
c->trevsorted = BATtrevordered(b);
c->H->nonil = b->H->nonil;
_______________________________________________
Checkin-list mailing list
[email protected]
http://mail.monetdb.org/mailman/listinfo/checkin-list
