summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2001-02-17 14:21:51 +0200
committermonty@donna.mysql.com <>2001-02-17 14:21:51 +0200
commit6fd7fb49cb34e296884f4b5b7aa5f0efdf87e109 (patch)
treed8dddb439992f4702f5e6227ba57fd16c79770c7 /scripts
parentccdd8bbb2413b4bf6cb318b6c6aa39ad0491fea9 (diff)
parentc533308a158795f91247e9fe3c7304fa5e7d2b3c (diff)
downloadmariadb-git-6fd7fb49cb34e296884f4b5b7aa5f0efdf87e109.tar.gz
Merge work:/my/mysql into donna.mysql.com:/home/my/bk/mysql
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysql_install_db.sh2
-rw-r--r--scripts/safe_mysqld.sh2
2 files changed, 2 insertions, 2 deletions
diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
index 4e2bb2f0b2e..3603e76b3d7 100644
--- a/scripts/mysql_install_db.sh
+++ b/scripts/mysql_install_db.sh
@@ -322,7 +322,7 @@ then
echo "able to use the new GRANT command!"
fi
echo
- if test -z "$IN_RPM"
+ if test "$IN_RPM" -eq 0
then
echo "You can start the MySQL demon with:"
echo "cd @prefix@ ; $bindir/safe_mysqld &"
diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh
index fc89f0c7848..7120587f1de 100644
--- a/scripts/safe_mysqld.sh
+++ b/scripts/safe_mysqld.sh
@@ -149,7 +149,7 @@ then
fi
fi
-USER=""
+USER_OPTION=""
if test -w /
then
USER_OPTION="--user=$user"