summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.(none)>2006-06-29 13:49:40 -0400
committerunknown <cmiller@zippy.(none)>2006-06-29 13:49:40 -0400
commite5d8d9d24d744cdce272578f1b8abe84335fa8bb (patch)
tree9dd8809c140488494b0d71ae8b4b2c2b9bf8ddae /scripts
parent801b1afe4dfe7c9edddab1e9708e0578a967bcf1 (diff)
parenta522b4a8608c29b6d5163e93e65920fe22fb7306 (diff)
downloadmariadb-git-e5d8d9d24d744cdce272578f1b8abe84335fa8bb.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into zippy.(none):/home/cmiller/work/mysql/mysql-5.0-maint
Diffstat (limited to 'scripts')
-rw-r--r--scripts/mysqld_safe.sh11
1 files changed, 7 insertions, 4 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh
index a584c384712..02a961dc3ec 100644
--- a/scripts/mysqld_safe.sh
+++ b/scripts/mysqld_safe.sh
@@ -321,10 +321,13 @@ then
ulimit -n $open_files
args="--open-files-limit=$open_files $args"
fi
- if test -n "$core_file_size"
- then
- ulimit -c $core_file_size
- fi
+fi
+
+# Try to set the core file size (even if we aren't root) because many systems
+# don't specify a hard limit on core file size.
+if test -n "$core_file_size"
+then
+ ulimit -c $core_file_size
fi
#