dump out tree ids in make.mysql.bash usage
change version test to accept more version strings
Merge branch 'keepcard'
compile on mysql 5.6