diff options
| author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-11-01 14:26:15 +0100 |
|---|---|---|
| committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-11-01 14:26:15 +0100 |
| commit | 8e1e2856f2523c225a81840059e93fa9f61fbacf (patch) | |
| tree | f1c708faf5aaeb27f255531d8c0f9dac32833b5b /sql/sql_base.cc | |
| parent | b0ff791618d97487fb7515d3f785b37f46eba132 (diff) | |
| parent | 80c951ce2875aac521b82323b5b6ebf638593445 (diff) | |
| download | mariadb-git-8e1e2856f2523c225a81840059e93fa9f61fbacf.tar.gz | |
Merge branch '10.4' into 10.5
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 2769575f2cb..dec5bd91f36 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1920,7 +1920,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 |