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
83f3d12f
Commit
83f3d12f
authored
Oct 01, 2020
by
Daniele Sciascia
Committed by
Jan Lindström
Nov 11, 2020
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Update wsrep-lib
Reviewed-by:
Jan Lindström
<
jan.lindstrom@mariadb.com
>
parent
3a5cf14d
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
34 additions
and
6 deletions
+34
-6
sql/wsrep_client_service.cc
sql/wsrep_client_service.cc
+22
-5
sql/wsrep_client_service.h
sql/wsrep_client_service.h
+11
-0
wsrep-lib
wsrep-lib
+1
-1
No files found.
sql/wsrep_client_service.cc
View file @
83f3d12f
...
@@ -246,6 +246,16 @@ void Wsrep_client_service::will_replay()
...
@@ -246,6 +246,16 @@ void Wsrep_client_service::will_replay()
mysql_mutex_unlock
(
&
LOCK_wsrep_replaying
);
mysql_mutex_unlock
(
&
LOCK_wsrep_replaying
);
}
}
void
Wsrep_client_service
::
signal_replayed
()
{
DBUG_ASSERT
(
m_thd
==
current_thd
);
mysql_mutex_lock
(
&
LOCK_wsrep_replaying
);
--
wsrep_replaying
;
DBUG_ASSERT
(
wsrep_replaying
>=
0
);
mysql_cond_broadcast
(
&
COND_wsrep_replaying
);
mysql_mutex_unlock
(
&
LOCK_wsrep_replaying
);
}
enum
wsrep
::
provider
::
status
Wsrep_client_service
::
replay
()
enum
wsrep
::
provider
::
status
Wsrep_client_service
::
replay
()
{
{
...
@@ -274,14 +284,15 @@ enum wsrep::provider::status Wsrep_client_service::replay()
...
@@ -274,14 +284,15 @@ enum wsrep::provider::status Wsrep_client_service::replay()
}
}
delete
replayer_thd
;
delete
replayer_thd
;
mysql_mutex_lock
(
&
LOCK_wsrep_replaying
);
--
wsrep_replaying
;
mysql_cond_broadcast
(
&
COND_wsrep_replaying
);
mysql_mutex_unlock
(
&
LOCK_wsrep_replaying
);
DBUG_RETURN
(
ret
);
DBUG_RETURN
(
ret
);
}
}
enum
wsrep
::
provider
::
status
Wsrep_client_service
::
replay_unordered
()
{
DBUG_ASSERT
(
0
);
return
wsrep
::
provider
::
error_not_implemented
;
}
void
Wsrep_client_service
::
wait_for_replayers
(
wsrep
::
unique_lock
<
wsrep
::
mutex
>&
lock
)
void
Wsrep_client_service
::
wait_for_replayers
(
wsrep
::
unique_lock
<
wsrep
::
mutex
>&
lock
)
{
{
DBUG_ASSERT
(
m_thd
==
current_thd
);
DBUG_ASSERT
(
m_thd
==
current_thd
);
...
@@ -301,6 +312,12 @@ void Wsrep_client_service::wait_for_replayers(wsrep::unique_lock<wsrep::mutex>&
...
@@ -301,6 +312,12 @@ void Wsrep_client_service::wait_for_replayers(wsrep::unique_lock<wsrep::mutex>&
lock
.
lock
();
lock
.
lock
();
}
}
enum
wsrep
::
provider
::
status
Wsrep_client_service
::
commit_by_xid
()
{
DBUG_ASSERT
(
0
);
return
wsrep
::
provider
::
error_not_implemented
;
}
void
Wsrep_client_service
::
debug_sync
(
const
char
*
sync_point
)
void
Wsrep_client_service
::
debug_sync
(
const
char
*
sync_point
)
{
{
DBUG_ASSERT
(
m_thd
==
current_thd
);
DBUG_ASSERT
(
m_thd
==
current_thd
);
...
...
sql/wsrep_client_service.h
View file @
83f3d12f
...
@@ -48,8 +48,19 @@ class Wsrep_client_service : public wsrep::client_service
...
@@ -48,8 +48,19 @@ class Wsrep_client_service : public wsrep::client_service
void
emergency_shutdown
()
void
emergency_shutdown
()
{
throw
wsrep
::
not_implemented_error
();
}
{
throw
wsrep
::
not_implemented_error
();
}
void
will_replay
();
void
will_replay
();
void
signal_replayed
();
enum
wsrep
::
provider
::
status
replay
();
enum
wsrep
::
provider
::
status
replay
();
enum
wsrep
::
provider
::
status
replay_unordered
();
void
wait_for_replayers
(
wsrep
::
unique_lock
<
wsrep
::
mutex
>&
);
void
wait_for_replayers
(
wsrep
::
unique_lock
<
wsrep
::
mutex
>&
);
enum
wsrep
::
provider
::
status
commit_by_xid
();
bool
is_explicit_xa
()
{
return
false
;
}
bool
is_xa_rollback
()
{
return
false
;
}
void
debug_sync
(
const
char
*
);
void
debug_sync
(
const
char
*
);
void
debug_crash
(
const
char
*
);
void
debug_crash
(
const
char
*
);
int
bf_rollback
();
int
bf_rollback
();
...
...
wsrep-lib
@
41a6e9da
Subproject commit
2da6e4894e1df5d1db51db2bbc49255e02251b9d
Subproject commit
41a6e9dad79c921134e44cf974b6b7ca3b84e538
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