into  kaamos.(none):/data/src/opt/mysql-5.1-opt


mysql-test/r/change_user.result:
  Auto merged
mysql-test/r/subselect.result:
  Auto merged
mysql-test/t/change_user.test:
  Auto merged