mirror of
https://github.com/MariaDB/server.git
synced 2026-05-07 15:45:33 +02:00
Merge 10.5 -> 10.6
Signed-off-by: Kristian Nielsen <knielsen@knielsen-hq.org>
This commit is contained in:
commit
0166c89e02
31 changed files with 578 additions and 48 deletions
|
|
@ -5598,7 +5598,7 @@ int Rows_log_event::do_apply_event(rpl_group_info *rgi)
|
|||
if (unlikely(open_and_lock_tables(thd, rgi->tables_to_lock, FALSE, 0)))
|
||||
{
|
||||
#ifdef WITH_WSREP
|
||||
if (WSREP(thd))
|
||||
if (WSREP(thd) && !thd->slave_thread)
|
||||
{
|
||||
WSREP_WARN("BF applier thread=%lu failed to open_and_lock_tables for "
|
||||
"%s, fatal: %d "
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue