summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorcmiller@zippy.(none) <>2006-06-29 13:49:40 -0400
committercmiller@zippy.(none) <>2006-06-29 13:49:40 -0400
commit244bdc96c3f5b6d61807591f682fbd1351a95730 (patch)
tree9dd8809c140488494b0d71ae8b4b2c2b9bf8ddae /scripts
parent7800da268a6e6c3abf5162a30c6add586072b50a (diff)
parentd6eaf59369b6693ad03a6e07267d5c709bceab21 (diff)
downloadmariadb-git-244bdc96c3f5b6d61807591f682fbd1351a95730.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
#