MonetDB: default - Merge with Oct2014 branch.

[Sjoerd Mullender]

Changeset: ab775ca7c4aa for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=ab775ca7c4aa
Modified Files:
        monetdb5/modules/mal/pcre.c
Branch: default
Log Message:

Merge with Oct2014 branch.


diffs (12 lines):

diff --git a/monetdb5/modules/mal/pcre.c b/monetdb5/modules/mal/pcre.c
--- a/monetdb5/modules/mal/pcre.c
+++ b/monetdb5/modules/mal/pcre.c
@@ -1677,7 +1677,7 @@ PCREsubjoin(bat *r1, bat *r2, bat lid, b
                        const char *esc, int caseignore)
 {
        BAT *left = NULL, *right = NULL, *candleft = NULL, *candright = NULL;
-       BAT *result1, *result2;
+       BAT *result1 = NULL, *result2 = NULL;
        char *msg = MAL_SUCCEED;
 
        if ((left = BATdescriptor(lid)) == NULL)
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list