MonetDB: Aug2018 - Merge with Mar2018 branch.

[Sjoerd Mullender]

Changeset: 7b9b18793587 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=7b9b18793587
Modified Files:
        monetdb5/optimizer/opt_multiplex.c
Branch: Aug2018
Log Message:

Merge with Mar2018 branch.


diffs (12 lines):

diff --git a/monetdb5/optimizer/opt_multiplex.c 
b/monetdb5/optimizer/opt_multiplex.c
--- a/monetdb5/optimizer/opt_multiplex.c
+++ b/monetdb5/optimizer/opt_multiplex.c
@@ -94,7 +94,7 @@ OPTexpandMultiplex(Client cntxt, MalBlkP
        if (alias == NULL || resB == NULL)  {
                GDKfree(alias);
                GDKfree(resB);
-               return NULL;
+               throw(MAL, "optimizer.multiplex", SQLSTATE(HY001) 
MAL_MALLOC_FAIL);
        }
 
        /* resB := new(refBat) */
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list