Changeset: d52d8dc4ccbd for MonetDB
URL: http://dev.monetdb.org/hg/MonetDB?cmd=changeset;node=d52d8dc4ccbd
Modified Files:
monetdb5/extras/pyapi/connection.c
sql/backends/monet5/sql_execute.c
Branch: pythonudf
Log Message:
Fix incorrect merge.
diffs (25 lines):
diff --git a/monetdb5/extras/pyapi/connection.c
b/monetdb5/extras/pyapi/connection.c
--- a/monetdb5/extras/pyapi/connection.c
+++ b/monetdb5/extras/pyapi/connection.c
@@ -272,7 +272,3 @@ void _connection_init(void)
if (PyType_Ready(&Py_ConnectionType) < 0)
return;
}
-
-void SQLdestroyResult(res_table *destroy) {
- res_table_destroy(destroy);
-}
diff --git a/sql/backends/monet5/sql_execute.c
b/sql/backends/monet5/sql_execute.c
--- a/sql/backends/monet5/sql_execute.c
+++ b/sql/backends/monet5/sql_execute.c
@@ -628,6 +628,10 @@ cleanup_engine:
return msg;
}
+void SQLdestroyResult(res_table *destroy) {
+ res_table_destroy(destroy);
+}
+
/* a hook is provided to execute relational algebra expressions */
str
RAstatement(Client c, MalBlkPtr mb, MalStkPtr stk, InstrPtr pci)
_______________________________________________
checkin-list mailing list
[email protected]
https://www.monetdb.org/mailman/listinfo/checkin-list
