-
unknown authored
into kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498 mysql-test/r/symlink.result: Auto merged mysql-test/t/symlink.test: Auto merged mysql-test/r/myisam.result: SCCS merged mysql-test/t/myisam.test: SCCS merged
525ca3f5
into kpdesk.mysql.com:/home/thek/dev/bug17489/my50-bug17498 mysql-test/r/symlink.result: Auto merged mysql-test/t/symlink.test: Auto merged mysql-test/r/myisam.result: SCCS merged mysql-test/t/myisam.test: SCCS merged