diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2020-10-29 13:03:08 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2020-10-29 13:03:08 +0100 |
| commit | 0697d75cd052e809b05cc3e812f5e48209c04b4c (patch) | |
| tree | 16524035d92e3d78dc27db00dbc30198aa84db78 /sql/sql_base.cc | |
| parent | f6549e95448e5cce52336361f5a59d1edcdac46a (diff) | |
| parent | c05e571e7d53ba11a3422490cff0d93e6691ea62 (diff) | |
| download | mariadb-git-10.5-merge.tar.gz | |
Merge commit 'c05e571e7d53ba11a3422490cff0d93e6691ea62' into HEAD10.5-merge
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 20f1fb356a3..2769575f2cb 100644 --- a/sql/sql_base.cc +++ b/sql/sql_base.cc @@ -1918,7 +1918,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) { |