database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00
Code Activity

Merge 10.5 into 10.6

Browse Source
This commit is contained in:
Marko Mäkelä
2024-10-03 09:31:39 +03:00
parent cc70ca7eab 170e4555e2
commit 7e0afb1c73
482 changed files with 4427 additions and 623 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/threadpool_common.cc
View File

@@ -304,7 +304,7 @@ static THD *threadpool_add_connection(CONNECT *connect, TP_connection *c)
if (!mysys_var ||!(thd= connect->create_thd(NULL)))
{
/* Out of memory? */
connect->close_and_delete();
connect->close_and_delete(0);
if (mysys_var)
my_thread_end();
return NULL;
@@ -497,7 +497,7 @@ static void tp_add_connection(CONNECT *connect)
if (c)
pool->add(c);
else
connect->close_and_delete();
connect->close_and_delete(0);
}
int tp_get_idle_thread_count()