sql/log.h: manual merge: moving 5.0 hunk into the correct file.
Attach a file by drag & drop or click to upload
