Merge 10.5 into 10.6

The changes to galera.galear_var_replicate_myisam_on
in commit d9b933bec6
are omitted due to conflicts
with commit 27d66d644c.
This commit is contained in:
Marko Mäkelä 2021-10-13 13:28:12 +03:00
commit a8379e53e8
76 changed files with 1136 additions and 365 deletions

3
.gitignore vendored
View file

@ -358,6 +358,7 @@ x86/
build/
bld/
[Bb]in/
/cmake-build-debug/
[Oo]bj/
# Roslyn cache directories
@ -541,7 +542,7 @@ compile_commands.json
.vscode/
# Clion && other JetBrains ides
.idea
/.idea/
.cache/clangd