summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authortim@cane.mysql.fi <>2001-01-02 16:24:32 +0200
committertim@cane.mysql.fi <>2001-01-02 16:24:32 +0200
commitd27457077c9813cf4a01b582699e82577cece30d (patch)
treed159aeb5711160ec61175ef69425cc9f1f5759f1
parent46be96625bba669fe7aff31216648db87bace7da (diff)
parent7dc1af15df0c8517c65db96db87d077b5f6a5cf0 (diff)
downloadmariadb-git-d27457077c9813cf4a01b582699e82577cece30d.tar.gz
Merge work.mysql.com:/home/bk/mysql
into cane.mysql.fi:/usr/home/tim/my/work
-rw-r--r--BitKeeper/etc/logging_ok1
-rwxr-xr-xBuild-tools/Do-compile2
2 files changed, 2 insertions, 1 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 78bae9c1a87..2b5c1cefe52 100644
--- a/BitKeeper/etc/logging_ok
+++ b/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
diff --git a/Build-tools/Do-compile b/Build-tools/Do-compile
index 9fbfb677292..6ab42d5a0d8 100755
--- a/Build-tools/Do-compile
+++ b/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");
}