into  pilot.(none):/data/msvensson/mysql/mysql-5.1-new-maint


client/mysql_upgrade.c:
  Auto merged