Tokutek/mariadb#12 rebase to mariadb-5.5.34