Fix MySQL errors from latest commits

Ref: #4349
3 files changed