Merge pull request #5425 from dlenev/ps-8.0-threadpool_debug-fix

dlenev · web-flow · commit a389a41acaf8 · 2024-09-12T19:03:24.000+02:00
PS-9328: Fix for failures to shutdown server after execution of threadpool_debug test (8.0 version)
diff --git a/sql/threadpool_unix.cc b/sql/threadpool_unix.cc
@@ -1197,6 +1197,7 @@ bool Thread_pool_connection_handler::add_connection(
 
   if (unlikely(!thd)) {
     channel_info->send_error_and_close_channel(ER_OUT_OF_RESOURCES, 0, false);
+    Connection_handler_manager::dec_connection_count();
     DBUG_RETURN(true);
   }
 
@@ -1206,6 +1207,7 @@ bool Thread_pool_connection_handler::add_connection(
     thd->get_protocol_classic()->end_net();
     delete thd;
     channel_info->send_error_and_close_channel(ER_OUT_OF_RESOURCES, 0, false);
+    Connection_handler_manager::dec_connection_count();
     DBUG_RETURN(true);
   }
 

Original file line number	Diff line number	Diff line change
`@@ -1197,6 +1197,7 @@ bool Thread_pool_connection_handler::add_connection(`
`1197`	`1197`
`1198`	`1198`	`if (unlikely(!thd)) {`
`1199`	`1199`	`channel_info->send_error_and_close_channel(ER_OUT_OF_RESOURCES, 0, false);`
	`1200`	`+ Connection_handler_manager::dec_connection_count();`
`1200`	`1201`	`DBUG_RETURN(true);`
`1201`	`1202`	`}`
`1202`	`1203`
`@@ -1206,6 +1207,7 @@ bool Thread_pool_connection_handler::add_connection(`
`1206`	`1207`	`thd->get_protocol_classic()->end_net();`
`1207`	`1208`	`delete thd;`
`1208`	`1209`	`channel_info->send_error_and_close_channel(ER_OUT_OF_RESOURCES, 0, false);`
	`1210`	`+ Connection_handler_manager::dec_connection_count();`
`1209`	`1211`	`DBUG_RETURN(true);`
`1210`	`1212`	`}`
`1211`	`1213`