into  stella.local:/home2/mydev/mysql-5.1-axmrg


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