into  ramayana.hindu.god:/home/tsmith/m/bk/build/51

Also use the opportunity to fix a bad merge (remove
duplicate code in mysql-test-run.pl).