diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 14:49:17 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-11-03 14:49:17 +0200 |
| commit | 533a13af069d8c9e6c5f4e1a72851497185ade03 (patch) | |
| tree | 4623752e0c114e582fbbc0afcc02b67dede26b50 /sql/sql_base.cc | |
| parent | 4b3690b50433a169d9feed5dc45044a8934b5582 (diff) | |
| parent | e6290a8270daf884f551230307225b358939bfab (diff) | |
| download | mariadb-git-533a13af069d8c9e6c5f4e1a72851497185ade03.tar.gz | |
Merge 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 |