diff options
| author | unknown <monty@mashka.mysql.fi> | 2002-11-12 13:28:58 +0200 |
|---|---|---|
| committer | unknown <monty@mashka.mysql.fi> | 2002-11-12 13:28:58 +0200 |
| commit | 5b53010f85daf777013685aad093c16a0b3670fd (patch) | |
| tree | d522520b63bd8dc4ee79e9144e767e6db27b3a8a /scripts | |
| parent | 3559b2f158541ed88ad630dcb0b242f5a32f4a3d (diff) | |
| parent | e1c1abd0e189e4581b9a22aed923df37e535e89b (diff) | |
| download | mariadb-git-5b53010f85daf777013685aad093c16a0b3670fd.tar.gz | |
merge
mysql-test/r/bdb.result:
Auto merged
mysql-test/r/innodb.result:
Auto merged
sql/sql_select.cc:
Merge
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 2 |
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 |