summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-12-31 11:38:44 +0200
committermonty@donna.mysql.com <>2000-12-31 11:38:44 +0200
commit4de5ac3327a9368d0a90ae4ff9ad5c272e421ce8 (patch)
treef0e63f2938983bf57301ef7e1bf1fd2fd2334fed /scripts
parent0135c0a350acb3eb461fb107f18d986b27d39565 (diff)
downloadmariadb-git-4de5ac3327a9368d0a90ae4ff9ad5c272e421ce8.tar.gz
Fixed new bug in BDB tables
Diffstat (limited to 'scripts')
-rw-r--r--scripts/safe_mysqld.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh
index 11d17f822ee..0265dcdeeb9 100644
--- a/scripts/safe_mysqld.sh
+++ b/scripts/safe_mysqld.sh
@@ -149,8 +149,10 @@ then
fi
fi
+USER=""
if test -w /
then
+ USER_OPTION="--user=$user"
# If we are root, change the err log to the right user.
touch $err_log; chown $user $err_log
if test -n "$open_files"
@@ -211,9 +213,9 @@ do
rm -f $MYSQL_UNIX_PORT $pid_file # Some extra safety
if test -z "$args"
then
- $NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR --user=$user --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1
+ $NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR $USER_OPTION --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ >> $err_log 2>&1
else
- eval "$NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR --user=$user --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ $args >> $err_log 2>&1"
+ eval "$NOHUP_NICENESS $ledir/$MYSQLD $defaults --basedir=$MY_BASEDIR_VERSION --datadir=$DATADIR $USER_OPTION --pid-file=$pid_file @MYSQLD_DEFAULT_SWITCHES@ $args >> $err_log 2>&1"
fi
if test ! -f $pid_file # This is removed if normal shutdown
then