into  pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint


mysql-test/r/mysql_upgrade.result:
  Auto merged
mysql-test/t/mysql_upgrade.test:
  Auto merged