mirror of
https://github.com/MariaDB/server.git
synced 2026-04-23 16:55:31 +02:00
Merge 10.5 into 10.6
The changes to galera.galear_var_replicate_myisam_on in commitd9b933bec6are omitted due to conflicts with commit27d66d644c.
This commit is contained in:
commit
a8379e53e8
76 changed files with 1136 additions and 365 deletions
3
.gitignore
vendored
3
.gitignore
vendored
|
|
@ -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
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue