Merge work.mysql.com:/home/bk/mysql

into cane.mysql.fi:/usr/home/tim/my/work


BitKeeper/etc/logging_ok:
  auto-union

BitKeeper/etc/logging_ok

@@ -5,3 +5,4 @@ mwagner@work.mysql.com
 sasha@mysql.sashanet.com
 sasha@work.mysql.com
 tim@cane.mysql.fi
+tim@work.mysql.com

Build-tools/Do-compile

@@ -142,7 +142,7 @@ $test_dir=<$pwd/$host/test/$ver-*>;
 
 if ($opt_stage <= 5 && !$opt_no_test)
 {
-  safe_cd($test_dir/mysql-test);
+  safe_cd("$test_dir/mysql-test");
   check_system("./mysql-test-run", "tests were successful");
 }