mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-07 15:45:33 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge 10.4 into 10.5

Browse source
This commit is contained in:
Marko Mäkelä 2019-12-17 14:46:57 +02:00
commit 3c7718150d
4 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
sql/wsrep_high_priority_service.h
View file

@ -85,6 +85,8 @@ public:
~Wsrep_applier_service();
int apply_write_set(const wsrep::ws_meta&, const wsrep::const_buffer&,
wsrep::mutable_buffer&);
int apply_nbo_begin(const wsrep::ws_meta&, const wsrep::const_buffer& data,
wsrep::mutable_buffer& err);
void after_apply();
bool is_replaying() const { return false; }
bool check_exit_status() const;
@ -97,6 +99,12 @@ public:
~Wsrep_replayer_service();
int apply_write_set(const wsrep::ws_meta&, const wsrep::const_buffer&,
wsrep::mutable_buffer&);
int apply_nbo_begin(const wsrep::ws_meta&, const wsrep::const_buffer& data,
wsrep::mutable_buffer& err)
{
DBUG_ASSERT(0); /* DDL should never cause replaying */
return 0;
}
void after_apply() { }
bool is_replaying() const { return true; }
void replay_status(enum wsrep::provider::status status)