Changeset: 55872aff17d0 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=55872aff17d0
Modified Files:
sql/test/emptydb/Tests/check.stable.out
sql/test/emptydb/Tests/check.stable.out.32bit
sql/test/emptydb/Tests/check.stable.out.int128
Branch: default
Log Message:
Merged with Oct2020
diffs (32 lines):
diff --git a/sql/backends/monet5/UDF/pyapi3/connection3.c
b/sql/backends/monet5/UDF/pyapi3/connection3.c
--- a/sql/backends/monet5/UDF/pyapi3/connection3.c
+++ b/sql/backends/monet5/UDF/pyapi3/connection3.c
@@ -41,6 +41,7 @@ static PyObject *_connection_execute(Py_
if (res != MAL_SUCCEED) {
PyErr_Format(PyExc_Exception, "SQL Query Failed: %s",
(res ?
getExceptionMessage(res) : "<no error>"));
+ freeException(res);
return NULL;
}
diff --git a/sql/backends/monet5/UDF/pyapi3/emit3.c
b/sql/backends/monet5/UDF/pyapi3/emit3.c
--- a/sql/backends/monet5/UDF/pyapi3/emit3.c
+++ b/sql/backends/monet5/UDF/pyapi3/emit3.c
@@ -204,7 +204,7 @@ PyObject *PyEmit_Emit(PyEmitObject *self
// insert NULL values up until the
current entry
for (ai = 0; ai < self->nvals; ai++) {
if
(BUNappend(self->cols[self->ncols].b,
-
ATOMnil(self->cols[self->ncols].b->ttype),
+
ATOMnilptr(self->cols[self->ncols].b->ttype),
false) != GDK_SUCCEED) {
msg =
GDKstrdup("BUNappend failed.");
goto wrapup;
@@ -368,7 +368,7 @@ PyObject *PyEmit_Emit(PyEmitObject *self
}
for (ai = 0; ai < (size_t)el_count; ai++) {
if (BUNappend(self->cols[i].b,
-
ATOMnil(self->cols[i].b->ttype),
+
ATOMnilptr(self->cols[i].b->ttype),
false) !=
GDK_SUCCEED) {
goto wrapup;
}
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
