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


mysql-test/t/mysql.test:
  Auto merged