diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 16:29:51 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2021-01-11 16:29:51 +0200 |
| commit | 8de233af815f28d096ac4ff136525abc3ddc771d (patch) | |
| tree | 98c524bbad2ebdced9635b83e51f647dac978cfc /sql/wsrep_trans_observer.h | |
| parent | 1015cbde5985e7e89c887ab30ce7c772671194c5 (diff) | |
| parent | fd5e103aa4b97e080dd497b93992e5f32ef83fdf (diff) | |
| download | mariadb-git-8de233af815f28d096ac4ff136525abc3ddc771d.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/wsrep_trans_observer.h')
| -rw-r--r-- | sql/wsrep_trans_observer.h | 10 |
1 files changed, 8 insertions, 2 deletions
diff --git a/sql/wsrep_trans_observer.h b/sql/wsrep_trans_observer.h index 35b93cb4bf5..e9b4ab8af15 100644 --- a/sql/wsrep_trans_observer.h +++ b/sql/wsrep_trans_observer.h @@ -476,12 +476,18 @@ wsrep_wait_rollback_complete_and_acquire_ownership(THD *thd) DBUG_VOID_RETURN; } -static inline int wsrep_before_command(THD* thd) +static inline int wsrep_before_command(THD* thd, bool keep_command_error) { return (thd->wsrep_cs().state() != wsrep::client_state::s_none && !thd->internal_transaction() ? - thd->wsrep_cs().before_command() : 0); + thd->wsrep_cs().before_command(keep_command_error) : 0); +} + +static inline int wsrep_before_command(THD* thd) +{ + return wsrep_before_command(thd, false); } + /* Called after each command. |