into neptunus.(none):/home/msvensson/mysql/mysql-5.0


client/mysqltest.c:
  Auto merged
sql/sql_base.cc:
  Auto merged