Update mariadb to 5.5.36
Merge pull request #548 from pyhalov/mariadb

Update mariadb to 5.5.36