diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-17 14:46:57 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2019-12-17 14:46:57 +0200 |
| commit | 3c7718150d6f4d608d0e37575e3c0d3ea9c5c119 (patch) | |
| tree | 49f98ca1096630ded5182a92077800f16e78cc00 | |
| parent | c24253d0fa3161b0703630b0fbdcb98d235073a5 (diff) | |
| parent | 67e063eb94c3b5618d7ccf29bead705605a50fd1 (diff) | |
| download | mariadb-git-3c7718150d6f4d608d0e37575e3c0d3ea9c5c119.tar.gz | |
Merge 10.4 into 10.5
| -rw-r--r-- | sql/wsrep_high_priority_service.cc | 8 | ||||
| -rw-r--r-- | sql/wsrep_high_priority_service.h | 8 | ||||
| -rw-r--r-- | sql/wsrep_mysqld.cc | 4 | ||||
| m--------- | wsrep-lib | 0 |
4 files changed, 17 insertions, 3 deletions
diff --git a/sql/wsrep_high_priority_service.cc b/sql/wsrep_high_priority_service.cc index 987a1765dcf..f5847493d10 100644 --- a/sql/wsrep_high_priority_service.cc +++ b/sql/wsrep_high_priority_service.cc @@ -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"); diff --git a/sql/wsrep_high_priority_service.h b/sql/wsrep_high_priority_service.h index a14498037d7..c275c352de2 100644 --- a/sql/wsrep_high_priority_service.h +++ b/sql/wsrep_high_priority_service.h @@ -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) diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 1ec80acf510..7345f2f7b9e 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -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) { diff --git a/wsrep-lib b/wsrep-lib -Subproject 9b25cebdf11e6da25d83e513a2e4b6db0515aba +Subproject 90157ed1b0f8b3f0d1eb3d60ac93ce6d8da7ad7 |