mysql: make cleaner directory layout for 5.5.*