mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-06 15:15:34 +02:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'bb-10.3-release' into bb-10.4-release

Browse source 
Note, the fix for "MDEV-23328 Server hang due to Galera lock conflict resolution"
was null-merged. 10.4 version of the fix is coming up separately
This commit is contained in:
Sergei Golubchik 2021-02-12 17:44:22 +01:00
commit 00a313ecf3
309 changed files with 21658 additions and 3342 deletions
Download patch file Download diff file Expand all files Collapse all files

1
sql/wsrep_thd.cc
View file

@ -22,7 +22,6 @@
#include "rpl_rli.h"
#include "log_event.h"
#include "sql_parse.h"
#include "sql_base.h" // close_thread_tables()
#include "mysqld.h" // start_wsrep_THD();
#include "wsrep_applier.h" // start_wsrep_THD();
#include "mysql/service_wsrep.h"