Commit 570c1a6f authored by Sergei Golubchik's avatar Sergei Golubchik

MDEV-5672 MariaDB 10.0.8 doesn't compile without perfschema

apply the upstream patch
parent 05aba79e
...@@ -358,7 +358,7 @@ NOTE! Use the corresponding macro in the header file, not this function ...@@ -358,7 +358,7 @@ NOTE! Use the corresponding macro in the header file, not this function
directly. Tries to lock the mutex for the current thread. If the lock is not directly. Tries to lock the mutex for the current thread. If the lock is not
acquired immediately, returns with return value 1. acquired immediately, returns with return value 1.
@return 0 if succeed, 1 if not */ @return 0 if succeed, 1 if not */
UNIV_INTERN UNIV_INLINE
ulint ulint
mutex_enter_nowait_func( mutex_enter_nowait_func(
/*====================*/ /*====================*/
......
...@@ -316,6 +316,23 @@ mutex_enter_func( ...@@ -316,6 +316,23 @@ mutex_enter_func(
mutex_spin_wait(mutex, high_priority, file_name, line); mutex_spin_wait(mutex, high_priority, file_name, line);
} }
/********************************************************************//**
NOTE! Use the corresponding macro in the header file, not this function
directly. Tries to lock the mutex for the current thread. If the lock is not
acquired immediately, returns with return value 1.
@return 0 if succeed, 1 if not */
UNIV_INLINE
ulint
mutex_enter_nowait_func(
/*====================*/
ib_prio_mutex_t* mutex, /*!< in: pointer to mutex */
const char* file_name, /*!< in: file name where mutex
requested */
ulint line) /*!< in: line where
requested */
{
return mutex_enter_nowait_func(&mutex->base_mutex, file_name, line);
}
#ifdef UNIV_PFS_MUTEX #ifdef UNIV_PFS_MUTEX
/******************************************************************//** /******************************************************************//**
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment