Changeset: b9b9086ac1ad for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/b9b9086ac1ad
Modified Files:
monetdb5/modules/mal/clients.c
Branch: default
Log Message:
Merge with Dec2023 branch.
diffs (31 lines):
diff --git a/monetdb5/modules/mal/clients.c b/monetdb5/modules/mal/clients.c
--- a/monetdb5/modules/mal/clients.c
+++ b/monetdb5/modules/mal/clients.c
@@ -479,9 +479,11 @@ CLTqueryTimeout(Client cntxt, MalBlkPtr
lng timeout_micro = ATOMIC_GET(&GDKdebug) & FORCEMITOMASK
&& qto == 1 ? 1000 : (lng) qto * 1000000;
mal_clients[idx].querytimeout = timeout_micro;
- QryCtx *qry_ctx = MT_thread_get_qry_ctx();
- if (qry_ctx) {
- qry_ctx->endtime = qry_ctx->starttime && timeout_micro
? qry_ctx->starttime + timeout_micro : 0;
+ if (timeout_micro != 1000) {
+ QryCtx *qry_ctx = MT_thread_get_qry_ctx();
+ if (qry_ctx) {
+ qry_ctx->endtime = qry_ctx->starttime &&
timeout_micro ? qry_ctx->starttime + timeout_micro : 0;
+ }
}
}
MT_lock_unset(&mal_contextLock);
diff --git a/sql/test/strimps/Tests/small_string_crash.test
b/sql/test/strimps/Tests/small_string_crash.test
--- a/sql/test/strimps/Tests/small_string_crash.test
+++ b/sql/test/strimps/Tests/small_string_crash.test
@@ -117,3 +117,9 @@ SELECT * FROM fal WHERE x LIKE 'Daniel%'
Daniel Sims
Daniel Sullivan
+query T nosort
+SELECT * FROM fal WHERE startswith(x, 'Daniel')
+----
+Daniel Sims
+Daniel Sullivan
+
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org
