diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 10:34:38 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2022-05-18 10:34:38 +0200 |
| commit | 99a433ed1cc2cebad93d6ece2b65691f2f49d3ea (patch) | |
| tree | e7fc16ab8fe9b4b9ff486d1adbc27ed84c72b923 /sql/wsrep_trans_observer.h | |
| parent | 0a1d9d0681fda7595c0d08038357b56cf3bea9eb (diff) | |
| parent | b2187662bcba12b66667bc0531727453b3b8a666 (diff) | |
| download | mariadb-git-99a433ed1cc2cebad93d6ece2b65691f2f49d3ea.tar.gz | |
Merge branch '10.6' into 10.7mariadb-10.7.4
Diffstat (limited to 'sql/wsrep_trans_observer.h')
| -rw-r--r-- | sql/wsrep_trans_observer.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/sql/wsrep_trans_observer.h b/sql/wsrep_trans_observer.h index 70759e381a5..f99d33094df 100644 --- a/sql/wsrep_trans_observer.h +++ b/sql/wsrep_trans_observer.h @@ -232,6 +232,10 @@ static inline int wsrep_before_prepare(THD* thd, bool all) WSREP_DEBUG("wsrep_before_prepare: %d", wsrep_is_real(thd, all)); int ret= 0; DBUG_ASSERT(wsrep_run_commit_hook(thd, all)); + if ((ret= thd->wsrep_parallel_slave_wait_for_prior_commit())) + { + DBUG_RETURN(ret); + } if ((ret= thd->wsrep_cs().before_prepare()) == 0) { DBUG_ASSERT(!thd->wsrep_trx().ws_meta().gtid().is_undefined()); |