mysql55: port latest changes from core mysql

Closes #153.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
mariadb10: port latest changes from core

Closes #154.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>