Accomodate various differences in mysql-trunk-cluster.