MonetDB: Jul2017 - Someone commit just before I pushed

[Pedro Ferreira]

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

Someone commit just before I pushed


diffs (19 lines):

diff --git a/sql/backends/monet5/sql.c b/sql/backends/monet5/sql.c
--- a/sql/backends/monet5/sql.c
+++ b/sql/backends/monet5/sql.c
@@ -1787,12 +1787,14 @@ SQLtid(Client cntxt, MalBlkPtr mb, MalSt
        if (store_funcs.count_del(tr, t)) {
                BAT *d = store_funcs.bind_del(tr, t, RD_INS);
                BAT *diff;
-               if( d == NULL)
+               if (d == NULL)
                        throw(SQL,"sql.tid","Can not bind delete column");
 
                diff = BATdiff(tids, d, NULL, NULL, 0, BUN_NONE);
                BBPunfix(d->batCacheid);
                BBPunfix(tids->batCacheid);
+               if (diff == NULL)
+                       throw(SQL,"sql.tid","Cannot subtract delete column");
                BAThseqbase(diff, sb);
                tids = diff;
        }
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list