into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.0-rpl


client/mysqltest.c:
  Auto merged
mysql-test/r/mysqltest.result:
  Auto merged