diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 12:52:44 +0300 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-08-20 12:52:44 +0300 |
| commit | d5d8756de3fa640b69793068937c0293587b16ee (patch) | |
| tree | 6fa32a78ae8bed380cee057f1f098633fde47df5 /sql/wsrep_mysqld.cc | |
| parent | b205e478a3ba7dfce69bba9e6187d412823b4949 (diff) | |
| parent | 2fa9f8c53a80e8b52c14d8c3260b18e7e77cc154 (diff) | |
| download | mariadb-git-d5d8756de3fa640b69793068937c0293587b16ee.tar.gz | |
Merge 10.4 into 10.5
Diffstat (limited to 'sql/wsrep_mysqld.cc')
| -rw-r--r-- | sql/wsrep_mysqld.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/wsrep_mysqld.cc b/sql/wsrep_mysqld.cc index 9a2d5e635a5..d0155f27d6d 100644 --- a/sql/wsrep_mysqld.cc +++ b/sql/wsrep_mysqld.cc @@ -1171,7 +1171,7 @@ bool wsrep_must_sync_wait (THD* thd, uint mask) mysql_mutex_lock(&thd->LOCK_thd_data); ret= (thd->variables.wsrep_sync_wait & mask) && thd->wsrep_client_thread && - thd->variables.wsrep_on && + WSREP_ON && !(thd->variables.wsrep_dirty_reads && !is_update_query(thd->lex->sql_command)) && !thd->in_active_multi_stmt_transaction() && |