mariadb10: port latest changes from core
mariadb10: port latest changes from core

Closes #154.

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

heuermh/homebrew-versions,jimhe/homebrew-versions,DomT4/homebrew-versions,Ashton-W/homebrew-versions,coeligena/homebrew-verscustomized,UniqMartin/homebrew-versions