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


client/mysql.cc:
  Auto merged
mysql-test/r/mysql.result:
  Manual merge.
mysql-test/t/mysql.test:
  Manual merge.