into mysql.com:/home/cps/mysql/trees/mysql-5.0


sql/mysqld.cc:
  Auto merged
sql-common/client.c:
  Auto merged