summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormonty@mashka.mysql.fi <>2002-11-11 15:57:35 +0200
committermonty@mashka.mysql.fi <>2002-11-11 15:57:35 +0200
commit876f3f4d308739805a0a1ac71c32c9dc3060a948 (patch)
treeaf6d24e40719efd42eef9d7580ef497455ddd45d /scripts
parentb0f5c6d625a77ef51554a1f98f1fd27b4b3f7801 (diff)
downloadmariadb-git-876f3f4d308739805a0a1ac71c32c9dc3060a948.tar.gz
Fixed that NULL and 0 returns 0 instead of NULL
This is coded to not cause a speed impact on top level AND expressions where we don't care if an AND expression returns 0 or NULL
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_safe.sh2
1 files changed, 1 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 2cc11bb0979..96d3437f96d 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -204,7 +204,7 @@ else
fi
USER_OPTION=""
-if test "x$USER" = "xroot"
+if test -w / -o "$USER" = "root"
then
if test "$user" != "root" -o $SET_USER = 1
then