MonetDB: Oct2020 - Don't forget the error message

[Pedro Ferreira]

Changeset: b011e4cbedab for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=b011e4cbedab
Modified Files:
        sql/backends/monet5/sql_subquery.c
Branch: Oct2020
Log Message:

Don't forget the error message


diffs (27 lines):

diff --git a/sql/backends/monet5/sql_subquery.c 
b/sql/backends/monet5/sql_subquery.c
--- a/sql/backends/monet5/sql_subquery.c
+++ b/sql/backends/monet5/sql_subquery.c
@@ -440,8 +440,10 @@ SQLany_cmp(Client cntxt, MalBlkPtr mb, M
 
        if (cmp || nl || nr) {
                q = cmp ? BATcount(cmp) : nl ? BATcount(nl) : BATcount(nr);
-               if ((res = COLnew(cmp ? cmp->hseqbase : nl ? nl->hseqbase : 
nr->hseqbase, TYPE_bit, q, TRANSIENT)) == NULL)
+               if (!(res = COLnew(cmp ? cmp->hseqbase : nl ? nl->hseqbase : 
nr->hseqbase, TYPE_bit, q, TRANSIENT))) {
+                       msg = createException(SQL, "sql.any_cmp", 
SQLSTATE(HY013) MAL_MALLOC_FAIL);
                        goto bailout;
+               }
                res_l = (bit *) Tloc(res, 0);
        }
 
@@ -541,8 +543,10 @@ SQLall_cmp(Client cntxt, MalBlkPtr mb, M
 
        if (cmp || nl || nr) {
                q = cmp ? BATcount(cmp) : nl ? BATcount(nl) : BATcount(nr);
-               if ((res = COLnew(cmp ? cmp->hseqbase : nl ? nl->hseqbase : 
nr->hseqbase, TYPE_bit, q, TRANSIENT)) == NULL)
+               if (!(res = COLnew(cmp ? cmp->hseqbase : nl ? nl->hseqbase : 
nr->hseqbase, TYPE_bit, q, TRANSIENT))) {
+                       msg = createException(SQL, "sql.all_cmp", 
SQLSTATE(HY013) MAL_MALLOC_FAIL);
                        goto bailout;
+               }
                res_l = (bit *) Tloc(res, 0);
        }
 
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list