This is a port of dveeden's work:

https://github.com/dveeden/mysql-server/commit/e9d00e859e3854bf8f71873caa69c060e670350b

(Mostly changes in linenumbers, a bit of whitespace fix-up.)