Merge bk-internal:/home/bk/mysql-5.1-maint2

into  shellback.(none):/home/msvensson/mysql/mysql-5.1-mtr


mysql-test/mysql-test-run.pl:
  Auto merged

mysql-test/lib/mtr_cases.pm

@@ -971,7 +971,7 @@ sub envsubst {
 
   if ( ! defined $ENV{$string} )
   {
-    mtr_error("opt file referense \$$string that is unknown");
+    mtr_error(".opt file references '$string' which is not set");
   }
 
   return $ENV{$string};

mysql-test/mysql-test-run.pl

@@ -388,6 +388,11 @@ sub command_line_setup {
 
   usage("") if $opt_usage;
 
+  # --------------------------------------------------------------------------
+  # Check mtr_build_thread and calculate baseport
+  # --------------------------------------------------------------------------
+  set_mtr_build_thread_ports($opt_mtr_build_thread);
+
   if ( -d "../sql" )
   {
     $source_dist=  1;