diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-31 21:06:49 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-31 21:06:49 +0100 |
| commit | 80c951ce2875aac521b82323b5b6ebf638593445 (patch) | |
| tree | df22c24e1fbe48362bd0eed50ec0c164e6c7e674 /sql/sql_base.cc | |
| parent | 1fddccf676e213f94923f5efaaa76d9793b19a89 (diff) | |
| parent | 794f66513967891520ec432123dcff8270871b93 (diff) | |
| download | mariadb-git-80c951ce2875aac521b82323b5b6ebf638593445.tar.gz | |
Merge branch '10.3' into 10.4
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index 9648f8922c2..4be70abb7db 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2020,7 +2020,7 @@ retry_share: #ifdef WITH_WSREP if (!((flags & MYSQL_OPEN_IGNORE_FLUSH) || - (wsrep_on(thd) && thd->wsrep_applier))) + (thd->wsrep_applier))) #else if (!(flags & MYSQL_OPEN_IGNORE_FLUSH)) #endif |