Tweak for MySQL 5.1 (instead of 5.5) compatability, and add some more test data.