Changeset: 91cd5a1bc0ed for MonetDB URL: https://dev.monetdb.org/hg/MonetDB/rev/91cd5a1bc0ed Modified Files: gdk/gdk_bbp.c Branch: default Log Message:
Merge with Mar2025 branch. diffs (62 lines): diff --git a/common/stream/monetdb-stream.pc.in b/common/stream/monetdb-stream.pc.in --- a/common/stream/monetdb-stream.pc.in +++ b/common/stream/monetdb-stream.pc.in @@ -16,7 +16,7 @@ Name: monetdb-stream Description: MonetDB streams library URL: https://www.monetdb.org/ Version: @MONETDB_VERSION@ -Requires.private: monetdb-utils = @MONETDB_VERSION@ @PKG_ZLIB@ @PKG_BZIP2@ @PKG_LZMA@ +Requires.private: monetdb-mutils = @MONETDB_VERSION@ @PKG_ZLIB@ @PKG_BZIP2@ @PKG_LZMA@ Libs: -L${libdir} -lstream-@MONETDB_VERSION@ Libs.private: @SOCKET_LIBS@ diff --git a/gdk/gdk_bbp.c b/gdk/gdk_bbp.c --- a/gdk/gdk_bbp.c +++ b/gdk/gdk_bbp.c @@ -503,6 +503,19 @@ heapinit(BAT *b, const char *buf, TRC_CRITICAL(GDK, "type wkba (SQL name: GeometryA) has been removed\n"); return -1; } +#ifdef HAVE_GEOM +#if GDKLIBRARY <= 061050U + if (strcmp(type, "wkb") == 0) { + /* don't trust properties having to do with ordering of + * type wkb because of a bug in the wkbCOMP + * implementation; this was fixed during the lifetime of + * BBP version 061050 */ + minpos = maxpos = oid_nil; + nosorted = norevsorted = 0; + properties &= ~0x0081; + } +#endif +#endif if (properties & ~0x1F81) { TRC_CRITICAL(GDK, "unknown properties are set: incompatible database on line %d of BBP.dir\n", lineno); diff --git a/geom/monetdb5/geom_atoms.c b/geom/monetdb5/geom_atoms.c --- a/geom/monetdb5/geom_atoms.c +++ b/geom/monetdb5/geom_atoms.c @@ -135,7 +135,7 @@ wkbCOMP(const void *L, const void *R) const wkb *l = L, *r = R; if (l->srid != r->srid) - return -1; + return l->srid - r->srid; int len = l->len; diff --git a/sql/backends/monet5/vaults/odbc/odbc_loader.c b/sql/backends/monet5/vaults/odbc/odbc_loader.c --- a/sql/backends/monet5/vaults/odbc/odbc_loader.c +++ b/sql/backends/monet5/vaults/odbc/odbc_loader.c @@ -417,8 +417,10 @@ odbc_query(int caller, mvc *sql, sql_sub return "Incomplete ODBC URI string. Missing 'QUERY=' part to specify the SQL SELECT query to execute."; char * query = GDKstrdup(&qry_str[6]); // we expect that QUERY= is at the end of the connection string - if (query == NULL || (query && (strcmp("", query) == 0))) + if (query == NULL || *query == 0) { + GDKfree(query); return "Incomplete ODBC URI string. Missing SQL SELECT query after 'QUERY='."; + } // create a new ODBC connection string without the QUERY= part char * odbc_con_str = GDKstrndup(con_str, qry_str - con_str); _______________________________________________ checkin-list mailing list -- [email protected] To unsubscribe send an email to [email protected]
