mysql: make cleaner directory layout for 5.5.*
Merge pull request #4603 from exlevan/master

mysql: make cleaner directory layout for 5.5.*