summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorunknown <tim@threads.polyesthetic.msg>2001-04-14 09:38:43 -0400
committerunknown <tim@threads.polyesthetic.msg>2001-04-14 09:38:43 -0400
commit46decdde430578a72e5852a62ae51f59d80f582f (patch)
tree5f81be3e23ed43e08cf32ef6758ce728b4ac91f0
parent9f7ef3624abf37fa4f85e0691decda8f8265b9c3 (diff)
parent15742ff34378a464c1b0ffa01f3cb5ace3d56866 (diff)
downloadmariadb-git-46decdde430578a72e5852a62ae51f59d80f582f.tar.gz
Merge
BitKeeper/etc/logging_ok: auto-union mysql-test/mysql-test-run.sh: SCCS merged
-rw-r--r--BitKeeper/etc/logging_ok5
-rw-r--r--mysql-test/mysql-test-run.sh5
2 files changed, 6 insertions, 4 deletions
diff --git a/BitKeeper/etc/logging_ok b/BitKeeper/etc/logging_ok
index 4479c2bc93a..fca969020be 100644
--- a/BitKeeper/etc/logging_ok
+++ b/BitKeeper/etc/logging_ok
@@ -1,3 +1,4 @@
-paul@central.snake.net
-monty@donna.mysql.fi
heikki@donna.mysql.fi
+monty@donna.mysql.fi
+paul@central.snake.net
+tim@threads.polyesthetic.msg
diff --git a/mysql-test/mysql-test-run.sh b/mysql-test/mysql-test-run.sh
index c9a4d56b75a..c42485c753f 100644
--- a/mysql-test/mysql-test-run.sh
+++ b/mysql-test/mysql-test-run.sh
@@ -24,10 +24,10 @@ PATH=/bin:/usr/bin:/usr/local/bin:/usr/bsd:/usr/X11R6/bin
which ()
{
- DIRS=`echo $PATH | tr ":" " "`
+ IFS="${IFS= }"; save_ifs="$IFS"; IFS=':'
for file
do
- for dir in $DIRS
+ for dir in $PATH
do
if test -f $dir/$file
then
@@ -38,6 +38,7 @@ which ()
echo "which: no $file in ($PATH)"
exit 1
done
+ IFS="$save_ifs"
}