Synced to upstream 5.5.33
Merge with upstream 5.5.33
Merge branch 'master' of github.com:ottok/pkg-mariadb