Changes for testing against Mysql 5.1