into  mysql.com:/home/mydev/mysql-5.1-bug15591


mysql-test/mysql-test-run.sh:
  Auto merged
sql/mysqld.cc:
  Bug#15591 - Occasional test suite abort due to port in use
  Manual merge.