into mysql.com:/home/gluh/MySQL/Merge/5.1-opt mysql-test/suite/funcs_1/r/innodb__datadict.result: manual merge mysql-test/suite/funcs_1/r/myisam__datadict.result: manual merge
