Changeset: ae21afeaac00 for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/ae21afeaac00
Modified Files:
geom/monetdb5/geom.c
sql/backends/monet5/sql.c
Branch: default
Log Message:
Merge with Dec2025 branch.
diffs (59 lines):
diff --git a/geom/monetdb5/geom.c b/geom/monetdb5/geom.c
--- a/geom/monetdb5/geom.c
+++ b/geom/monetdb5/geom.c
@@ -2567,6 +2567,8 @@ wkbFromBinaryWithBuffer(allocator *ma, w
}
//compute the value for s
+ w->len = (int) wkbLength;
+ w->srid = 0;
for (i = 0; i < strLength; i += 2) {
int firstHalf = decit((*inStr)[i]);
int secondHalf = decit((*inStr)[i + 1]);
@@ -2576,8 +2578,6 @@ wkbFromBinaryWithBuffer(allocator *ma, w
w->data[i / 2] = (firstHalf << 4) | secondHalf;
}
- w->len = (int) wkbLength;
- w->srid = 0;
return MAL_SUCCEED;
}
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
@@ -5462,7 +5462,7 @@ SQLstr_auto_vacuum(Client cntxt, MalBlkP
if (c && c->storage_type)
throw(SQL, "sql.str_auto_vacuum", SQLSTATE(42000) "Cannot
vacuum compressed column");
- if (!(sname_copy = SA_STRDUP(mb->ma, sname)) || !(tname_copy =
SA_STRDUP(mb->ma, tname)) || (cname && !(cname_copy = SA_STRDUP(mb->ma,
cname)))) {
+ if (!(sname_copy = GDKstrdup(sname)) || !(tname_copy =
GDKstrdup(tname)) || (cname && !(cname_copy = GDKstrdup(cname)))) {
throw(SQL, "sql.str_auto_vacuum", SQLSTATE(HY013)
MAL_MALLOC_FAIL);
}
void *argv[4] = {m->store, sname_copy, tname_copy, cname_copy};
diff --git a/tools/merovingian/client/monetdb.1
b/tools/merovingian/client/monetdb.1
--- a/tools/merovingian/client/monetdb.1
+++ b/tools/merovingian/client/monetdb.1
@@ -118,7 +118,7 @@ With the
.B \-m
flag, instead of creating a database, a multiplex-funnel is created.
See section
-.I MULTIPLEX-FUNNEL
+.I MULTIPLEX-FUNNELS
in
.IR monetdbd (1).
The pattern argument is not fully the same as a pattern for connecting
@@ -440,9 +440,10 @@ optimizations that can lead to improved
\fBnclients=\fP\fInumber\fP
Sets the maximum amount of clients that can connect to this database at
the same time. Setting this to a high value is discouraged. A
-multiplex-funnel may be more performant, see
-.I MULTIPLEX-FUNNEL
-below.
+multiplex-funnel may be more performant, see section
+.I MULTIPLEX-FUNNELS
+in
+.IR monetdbd (1).
.TP
.BR raw_strings= < yes | no >
Defines how the server interprets literal strings. See the
_______________________________________________
checkin-list mailing list -- [email protected]
To unsubscribe send an email to [email protected]
