into trift2.:/M51/merge-5.0-to-5.1 support-files/mysql.spec.sh: Null-merge, as 5.1 uses a different approach to testing.
