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
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
nexedi
MariaDB
Commits
26d913a7
Commit
26d913a7
authored
Jan 08, 2021
by
Jan Lindström
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update wsrep-lib
parent
033f8d13
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
3 deletions
+3
-3
sql/wsrep_client_service.cc
sql/wsrep_client_service.cc
+1
-1
sql/wsrep_condition_variable.h
sql/wsrep_condition_variable.h
+1
-1
wsrep-lib
wsrep-lib
+1
-1
No files found.
sql/wsrep_client_service.cc
View file @
26d913a7
...
@@ -74,7 +74,7 @@ bool Wsrep_client_service::interrupted(
...
@@ -74,7 +74,7 @@ bool Wsrep_client_service::interrupted(
Locking order is:
Locking order is:
1) LOCK_thd_data
1) LOCK_thd_data
2) LOCK_thd_kill */
2) LOCK_thd_kill */
mysql_mutex_assert_owner
(
static_cast
<
mysql_mutex_t
*>
(
lock
.
mutex
()
.
native
()));
mysql_mutex_assert_owner
(
static_cast
<
mysql_mutex_t
*>
(
lock
.
mutex
()
->
native
()));
mysql_mutex_lock
(
&
m_thd
->
LOCK_thd_kill
);
mysql_mutex_lock
(
&
m_thd
->
LOCK_thd_kill
);
bool
ret
=
(
m_thd
->
killed
!=
NOT_KILLED
);
bool
ret
=
(
m_thd
->
killed
!=
NOT_KILLED
);
if
(
ret
)
if
(
ret
)
...
...
sql/wsrep_condition_variable.h
View file @
26d913a7
...
@@ -44,7 +44,7 @@ class Wsrep_condition_variable : public wsrep::condition_variable
...
@@ -44,7 +44,7 @@ class Wsrep_condition_variable : public wsrep::condition_variable
void
wait
(
wsrep
::
unique_lock
<
wsrep
::
mutex
>&
lock
)
void
wait
(
wsrep
::
unique_lock
<
wsrep
::
mutex
>&
lock
)
{
{
mysql_mutex_t
*
mutex
=
static_cast
<
mysql_mutex_t
*>
(
lock
.
mutex
()
.
native
());
mysql_mutex_t
*
mutex
=
static_cast
<
mysql_mutex_t
*>
(
lock
.
mutex
()
->
native
());
mysql_cond_wait
(
&
m_cond
,
mutex
);
mysql_cond_wait
(
&
m_cond
,
mutex
);
}
}
private:
private:
...
...
wsrep-lib
@
a93955dd
Subproject commit
515ac816f98329c0227d0060cc9339c889810834
Subproject commit
a93955ddeef5989505cbb3a9f8bb124341462569
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