into  pilot.mysql.com:/data/msvensson/mysql/mysql-5.1-bugteam


client/mysqltest.c:
  Auto merged
dbug/dbug.c:
  Auto merged
mysql-test/mysql-test-run.pl:
  Auto merged
client/mysql_upgrade.c:
  SCCS merged