Merge 10.4 into 10.5

MariaDB · Dec 17, 2019 · 3c77181 · 3c77181
2 parents c24253d + 67e063e
commit 3c77181
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 4 deletions.
diff --git 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
@@ -85,6 +85,8 @@ class Wsrep_applier_service : public Wsrep_high_priority_service
   ~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 @@ class Wsrep_replayer_service : public Wsrep_high_priority_service
   ~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
@@ -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