summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-09-13 01:08:34 +0300
committermonty@donna.mysql.com <>2000-09-13 01:08:34 +0300
commit47265938625c8cb7832cf15a8e39caf6b64c4b30 (patch)
tree42c131dcc09b3b264d33b14120eaae7687ab2425 /scripts
parentf2d930c388eb48174addd3e0cd542f3d0811ac6e (diff)
downloadmariadb-git-47265938625c8cb7832cf15a8e39caf6b64c4b30.tar.gz
Fixes for FULLTEXT and TIME type
Diffstat (limited to 'scripts')
-rwxr-xr-xscripts/safe_mysqld.sh20
1 files changed, 14 insertions, 6 deletions
diff --git a/scripts/safe_mysqld.sh b/scripts/safe_mysqld.sh
index 1ad9e962096..5a5f8dddb02 100755
--- a/scripts/safe_mysqld.sh
+++ b/scripts/safe_mysqld.sh
@@ -88,16 +88,24 @@ then
fi
-NOHUP_NICENESS=`nohup nice`
-if test $? -ne 0 || test x"$NOHUP_NICENESS" = x0 || test ! nice --1 echo foo > /dev/null 2>&1; then
- NOHUP_NICENESS="nohup"
-else
- NOHUP_NICENESS="nice --$NOHUP_NICENESS nohup"
+NOHUP_NICENESS="nohup"
+if test -w /
+then
+ NOHUP_NICENESS=`nohup nice`
+ if test $? -ne 0 || test x"$NOHUP_NICENESS" = x0 || test ! nice --1 echo foo > /dev/null 2>&1; then
+ NOHUP_NICENESS="nohup"
+ else
+ NOHUP_NICENESS="nice --$NOHUP_NICENESS nohup"
+ fi
fi
export MYSQL_UNIX_PORT
export MYSQL_TCP_PORT
-touch $err_log; chown $user $err_log
+if test -w /
+then
+ # If we are root, change the err log to the right user.
+ touch $err_log; chown $user $err_log
+fi
#
# If there exists an old pid file, check if the daemon is already running