mirror of
https://github.com/MariaDB/server.git
synced 2025-10-27 05:56:07 +03:00
Revert a change that should have been a part of 3008.2.76..3008.2.78.
This commit is contained in:
@@ -2371,30 +2371,6 @@ loop:
|
|||||||
OS_THREAD_DUMMY_RETURN;
|
OS_THREAD_DUMMY_RETURN;
|
||||||
}
|
}
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
Increment the server activity count. */
|
|
||||||
UNIV_INLINE
|
|
||||||
void
|
|
||||||
srv_inc_activity_count_low(void)
|
|
||||||
/*============================*/
|
|
||||||
{
|
|
||||||
mutex_enter(&kernel_mutex);
|
|
||||||
|
|
||||||
++srv_activity_count;
|
|
||||||
|
|
||||||
mutex_exit(&kernel_mutex);
|
|
||||||
}
|
|
||||||
|
|
||||||
/******************************************************************//**
|
|
||||||
Increment the server activity count. */
|
|
||||||
UNIV_INTERN
|
|
||||||
void
|
|
||||||
srv_inc_activity_count(void)
|
|
||||||
/*========================*/
|
|
||||||
{
|
|
||||||
srv_inc_activity_count_low();
|
|
||||||
}
|
|
||||||
|
|
||||||
/**********************************************************************//**
|
/**********************************************************************//**
|
||||||
Check whether any background thread is active.
|
Check whether any background thread is active.
|
||||||
@return FALSE if all are are suspended or have exited. */
|
@return FALSE if all are are suspended or have exited. */
|
||||||
@@ -2431,9 +2407,7 @@ void
|
|||||||
srv_active_wake_master_thread(void)
|
srv_active_wake_master_thread(void)
|
||||||
/*===============================*/
|
/*===============================*/
|
||||||
{
|
{
|
||||||
ut_ad(!mutex_own(&kernel_mutex));
|
srv_activity_count++;
|
||||||
|
|
||||||
srv_inc_activity_count_low();
|
|
||||||
|
|
||||||
if (srv_n_threads_active[SRV_MASTER] == 0) {
|
if (srv_n_threads_active[SRV_MASTER] == 0) {
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user