Most conflicts are related to the MDEV-11638 InnoDB shutdown refactoring.
Attach a file by drag & drop or click to upload
