into  naruto.:C:/cpp/mysql-5.1-runtime


mysql-test/t/mysqldump.test:
  Auto merged
client/mysqldump.c:
  manual merge