mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-01-15 19:42:28 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

8
sql/wsrep_high_priority_service.cc
View file

@ -527,6 +527,14 @@ int Wsrep_applier_service::apply_write_set(const wsrep::ws_meta& ws_meta,
DBUG_RETURN(ret);
}
int Wsrep_applier_service::apply_nbo_begin(const wsrep::ws_meta& ws_meta,
const wsrep::const_buffer& data,
wsrep::mutable_buffer& err)
{
DBUG_ENTER("Wsrep_applier_service::apply_nbo_begin");
DBUG_RETURN(0);
}
void Wsrep_applier_service::after_apply()
{
DBUG_ENTER("Wsrep_applier_service::after_apply");

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)

4
sql/wsrep_mysqld.cc
View file

@ -1888,9 +1888,7 @@ static int wsrep_TOI_begin(THD *thd, const char *db, const char *table,
wsrep::client_state& cs(thd->wsrep_cs());
int ret= cs.enter_toi_local(key_array,
wsrep::const_buffer(buff.ptr, buff.len),
wsrep::provider::flag::start_transaction |
wsrep::provider::flag::commit);
wsrep::const_buffer(buff.ptr, buff.len));
if (ret)
{

2
wsrep-lib

@ -1 +1 @@
Subproject commit 9b25cebdf11e6da25d83e513a2e4b6db0515abad
Subproject commit 90157ed1b0f8b3f0d1eb3d60ac93ce6d8da7ad77