Update mariadb formula with the changes to mysql formula

This applies the following changesets to mariadb.

48f7e862f8ee3df46948e259fce6fcb6a5a2479a
2e81448c576b5b7296e813aa31a6e537cb14d4e8
3bffe5629cbf6b308ec045621339214b468fee2d
734f082db9da334eb66f9122e916161db9e69618
d6996fcdfc5fd5d356d142d532e23b0ac405adf6
336c97637c5449018cde59f7d2a87a298692da08