database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

Merge 10.6 into 10.7

Browse Source
This commit is contained in:
Jan Lindström
2022-09-05 14:55:47 +03:00
parent b86be02ecf 9fefd440b5
commit 5fdbb3a72e
71 changed files with 509 additions and 2965 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
sql/sql_class.cc
View File

@ -67,6 +67,7 @@
#ifdef WITH_WSREP
#include "wsrep_thd.h"
#include "wsrep_trans_observer.h"
#include "wsrep_server_state.h"
#else
static inline bool wsrep_is_bf_aborted(THD* thd) { return false; }
#endif /* WITH_WSREP */