database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +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

16
sql/sql_connect.cc
View File

@ -1362,7 +1362,7 @@ void do_handle_one_connection(CONNECT *connect, bool put_in_cache)
THD *thd;
if (!(thd= connect->create_thd(NULL)))
{
connect->close_and_delete();
connect->close_and_delete(0);
return;
}
@ -1437,7 +1437,7 @@ end_thread:
if (!(connect->create_thd(thd)))
{
/* Out of resources. Free thread to get more resources */
connect->close_and_delete();
connect->close_and_delete(0);
break;
}
delete connect;
@ -1466,9 +1466,11 @@ end_thread:
Close connection without error and delete the connect object
This and close_with_error are only called if we didn't manage to
create a new thd object.
Note: err can be 0 if unknown/not inportant
*/
void CONNECT::close_and_delete()
void CONNECT::close_and_delete(uint err)
{
DBUG_ENTER("close_and_delete");
@ -1482,7 +1484,11 @@ void CONNECT::close_and_delete()
vio_type= VIO_CLOSED;
--*scheduler->connection_count;
statistic_increment(connection_errors_internal, &LOCK_status);
if (err == ER_CON_COUNT_ERROR)
statistic_increment(connection_errors_max_connection, &LOCK_status);
else
statistic_increment(connection_errors_internal, &LOCK_status);
statistic_increment(aborted_connects,&LOCK_status);
delete this;
@ -1506,7 +1512,7 @@ void CONNECT::close_with_error(uint sql_errno,
delete thd;
set_current_thd(0);
}
close_and_delete();
close_and_delete(close_error);
}