summaryrefslogtreecommitdiff
path: root/scripts/mysqld_safe.sh
diff options
context:
space:
mode:
Diffstat (limited to 'scripts/mysqld_safe.sh')
-rw-r--r--scripts/mysqld_safe.sh3
1 files changed, 2 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index 9dea2eb3935..96d3437f96d 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -204,7 +204,7 @@ else
fi
USER_OPTION=""
-if test -w /
+if test -w / -o "$USER" = "root"
then
if test "$user" != "root" -o $SET_USER = 1
then
@@ -215,6 +215,7 @@ then
if test -n "$open_files"
then
ulimit -n $open_files
+ args="open-files-limit=$open_files $args"
fi
if test -n "$core_file_size"
then