MonetDB: default - Merge with Aug2024 branch.

[Sjoerd Mullender via checkin-list]

Changeset: 042e00173dcc for MonetDB
URL: https://dev.monetdb.org/hg/MonetDB/rev/042e00173dcc
Modified Files:
        sql/storage/store.c
Branch: default
Log Message:

Merge with Aug2024 branch.


diffs (68 lines):

diff --git a/sql/storage/store.c b/sql/storage/store.c
--- a/sql/storage/store.c
+++ b/sql/storage/store.c
@@ -7244,8 +7244,10 @@ sql_session_create(sqlstore *store, allo
 {
        sql_session *s;
 
-       if (store->singleuser > 1)
+       if (store->singleuser > 1) {
+               TRC_ERROR(SQL_STORE, "No second connection allowed in 
singleuser mode\n");
                return NULL;
+       }
 
        s = ZNEW(sql_session);
        if (!s)
@@ -7264,7 +7266,7 @@ sql_session_create(sqlstore *store, allo
                return NULL;
        }
        if (store->singleuser)
-               store->singleuser++;
+               store->singleuser = 2;
        return s;
 }
 
@@ -7274,7 +7276,7 @@ sql_session_destroy(sql_session *s)
        if (s->tr) {
                sqlstore *store = s->tr->store;
                if (store->singleuser)
-                       store->singleuser--;
+                       store->singleuser = 1;
        }
        // TODO check if s->tr is not always there
        assert(!s->tr || s->tr->active == 0);
diff --git a/sql/test/BugTracker-2024/Tests/7566-connections-refused.SQL.py 
b/sql/test/BugTracker-2024/Tests/7566-connections-refused.SQL.py
new file mode 100644
--- /dev/null
+++ b/sql/test/BugTracker-2024/Tests/7566-connections-refused.SQL.py
@@ -0,0 +1,15 @@
+import sys,os, pymonetdb
+
+db = os.getenv("TSTDB")
+port = int(os.getenv("MAPIPORT"))
+
+connections = []
+for i in range(130):
+    conn = pymonetdb.connect(database=db, port=port, autocommit=True, 
username='monetdb', password='monetdb')
+    connections.append(conn)
+
+for conn in connections:
+    conn.close()
+
+conn = pymonetdb.connect(database=db, port=port, autocommit=True, 
username='monetdb', password='monetdb')
+conn.close()
diff --git a/sql/test/BugTracker-2024/Tests/All 
b/sql/test/BugTracker-2024/Tests/All
--- a/sql/test/BugTracker-2024/Tests/All
+++ b/sql/test/BugTracker-2024/Tests/All
@@ -82,3 +82,4 @@ 7554-incorrect-result-between
 7555-incorrect-semijoin-rewrite
 7556-missing-ignore-case
 7465-fwf-block-boundary-error
+7566-connections-refused
diff --git a/sql/test/BugTracker-2024/Tests/SingleServer 
b/sql/test/BugTracker-2024/Tests/SingleServer
--- a/sql/test/BugTracker-2024/Tests/SingleServer
+++ b/sql/test/BugTracker-2024/Tests/SingleServer
@@ -1,2 +1,3 @@
 --set embedded_c=true
 --set capi_cc='cc -std=c99'
+--set max_clients=2048
_______________________________________________
checkin-list mailing list -- checkin-list@monetdb.org
To unsubscribe send an email to checkin-list-le...@monetdb.org