Merge magare.gmz:/home/kgeorge/mysql/autopush/merge-5.0-bugteam

into  magare.gmz:/home/kgeorge/mysql/work/merge-5.1-bugteam


client/mysqltest.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged