Changeset: a9a3aa894d46 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=a9a3aa894d46
Modified Files:
sql/backends/monet5/sql.c
Branch: default
Log Message:
Merge with Mar2018 branch.
diffs (16 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
@@ -2133,10 +2133,8 @@ mvc_row_result_wrap( Client cntxt, MalBl
if ((msg = checkSQLContext(cntxt)) != NULL)
return msg;
res = *res_id = mvc_result_table(m, mb->tag, pci->argc - (pci->retc +
5), 1, NULL);
- if(res < 0) {
- msg = createException(SQL, "sql.resultset", SQLSTATE(HY001)
MAL_MALLOC_FAIL);
- goto wrapup_result_set;
- }
+ if (res < 0)
+ throw(SQL, "sql.resultset", SQLSTATE(HY001) MAL_MALLOC_FAIL);
tbl = BATdescriptor(tblId);
atr = BATdescriptor(atrId);
_______________________________________________
checkin-list mailing list
checkin-list@monetdb.org
https://www.monetdb.org/mailman/listinfo/checkin-list
