diff options
author | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-30 17:23:53 +0100 |
---|---|---|
committer | Oleksandr Byelkin <sanja@mariadb.com> | 2020-10-30 17:23:53 +0100 |
commit | 794f66513967891520ec432123dcff8270871b93 (patch) | |
tree | da31ab80611c016e9dca9af28ffd65c4a838e2f5 /sql/sql_base.cc | |
parent | 14d43f4fa691e3af113195a3608f1fc401b85090 (diff) | |
parent | 72eea39d4c4a8bcadccfdac457e61abc7b618ff8 (diff) | |
download | mariadb-git-794f66513967891520ec432123dcff8270871b93.tar.gz |
Merge branch '10.2' into 10.3
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 89a58bae272..ada1a7cd36a 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1916,7 +1916,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 |