Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
M
mariadb
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Kirill Smelkov
mariadb
Commits
570c1a6f
Commit
570c1a6f
authored
Feb 27, 2014
by
Sergei Golubchik
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MDEV-5672 MariaDB 10.0.8 doesn't compile without perfschema
apply the upstream patch
parent
05aba79e
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
18 additions
and
1 deletion
+18
-1
storage/xtradb/include/sync0sync.h
storage/xtradb/include/sync0sync.h
+1
-1
storage/xtradb/include/sync0sync.ic
storage/xtradb/include/sync0sync.ic
+17
-0
No files found.
storage/xtradb/include/sync0sync.h
View file @
570c1a6f
...
@@ -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_IN
TERN
UNIV_IN
LINE
ulint
ulint
mutex_enter_nowait_func
(
mutex_enter_nowait_func
(
/*====================*/
/*====================*/
...
...
storage/xtradb/include/sync0sync.ic
View file @
570c1a6f
...
@@ -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
/******************************************************************//**
/******************************************************************//**
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment