mysql-test/mysql-test-run.pl:
  BUG#31880 make test failure from public bk tree
  
  Instead of handling "MTR_BUILD_THREAD set" and "MTR_BUILD_THREAD not set" differently, use the same subroutine to set up the port numbers. The addition of a second master apparently broke the old static port numbers.