Changeset: 5f6baf399afe for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/5f6baf399afe
Modified Files:
gdk/gdk_bbp.c
geom/monetdb5/geom_atoms.c
Branch: Mar2025
Log Message:
Merge with Aug2024 branch.
diffs (35 lines):
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;
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
