After-rebase fixes. Rebase was done to be able to build on top of the binlog background thread of MDEV-532.
Attach a file by drag & drop or click to upload
