mariadb: port latest changes from mysql formula

Closes #20734.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
SBT 0.12.4, 0.13.0-RC1

Closes #20906.

Signed-off-by: Adam Vandenberg <flangy@gmail.com>