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


tests/mysql_client_test.c:
  Auto merged