diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-29 13:38:38 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2020-10-29 13:38:38 +0200 |
| commit | 7b2bb67113bdda470955e3d4d72be0f2c0b38902 (patch) | |
| tree | 9f9f34da1a4e48c243c56ff161987074ef907cbb /sql/sql_base.cc | |
| parent | 27b762e23d8305bbc65dc61d283fe192e2dbd00a (diff) | |
| parent | 1e778a3b5624f97fdf44a15fd6cee3d615891cff (diff) | |
| download | mariadb-git-7b2bb67113bdda470955e3d4d72be0f2c0b38902.tar.gz | |
Merge 10.3 into 10.4
Diffstat (limited to 'sql/sql_base.cc')
| -rw-r--r-- | sql/sql_base.cc | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/sql/sql_base.cc b/sql/sql_base.cc index ede62b727d3..9648f8922c2 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -2018,7 +2018,12 @@ retry_share: DBUG_RETURN(FALSE); } +#ifdef WITH_WSREP + if (!((flags & MYSQL_OPEN_IGNORE_FLUSH) || + (wsrep_on(thd) && thd->wsrep_applier))) +#else if (!(flags & MYSQL_OPEN_IGNORE_FLUSH)) +#endif { if (share->tdc->flushed) { |