Null merge of mysql-5.0-bugteam into mysql-5.1-bugteam.