into  zippy.cornsilk.net:/home/cmiller/work/mysql/mysql-5.1-maint

Fixes bad merge.


tests/mysql_client_test.c:
  Manually merged.