MonetDB: default - Merge with Oct2014 branch.

[Sjoerd Mullender]

Changeset: c79697f77ccf for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=c79697f77ccf
Modified Files:
        gdk/gdk_join.c
        gdk/gdk_select.c
        monetdb5/modules/mal/mat.c
        monetdb5/modules/mal/pcre.c
        monetdb5/modules/mal/tablet.c
        sql/backends/monet5/sql_result.c
Branch: default
Log Message:

Merge with Oct2014 branch.


diffs (40 lines):

diff --git a/gdk/gdk_join.c b/gdk/gdk_join.c
--- a/gdk/gdk_join.c
+++ b/gdk/gdk_join.c
@@ -1691,10 +1691,8 @@ mergejoin(BAT *r1, BAT *r2, BAT *l, BAT 
        return GDK_SUCCEED;
 
   bailout:
-       if (r1)
-               BBPreclaim(r1);
-       if (r2)
-               BBPreclaim(r2);
+       BBPreclaim(r1);
+       BBPreclaim(r2);
        return GDK_FAIL;
 }
 
@@ -1726,7 +1724,7 @@ binsearchcand(const oid *cand, BUN lo, B
                        BATsetcount(r1, BATcount(r1));                  \
                        BATsetcount(r2, BATcount(r2));                  \
                        if (BATextend(r1, newcap) != GDK_SUCCEED ||     \
-                           BATextend(r2, newcap) != GDK_SUCCEED)               
\
+                           BATextend(r2, newcap) != GDK_SUCCEED)       \
                                goto bailout;                           \
                        assert(BATcapacity(r1) == BATcapacity(r2));     \
                }                                                       \
diff --git a/gdk/gdk_select.c b/gdk/gdk_select.c
--- a/gdk/gdk_select.c
+++ b/gdk/gdk_select.c
@@ -2511,9 +2511,7 @@ rangejoin(BAT *r1, BAT *r2, BAT *l, BAT 
        return GDK_SUCCEED;
 
   bailout:
-       if (r1)
-               BBPreclaim(r1);
-       if (r2)
-               BBPreclaim(r2);
+       BBPreclaim(r1);
+       BBPreclaim(r2);
        return GDK_FAIL;
 }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list