summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <igreenhoe@mysql.com>2006-06-28 08:32:41 -0700
committerunknown <igreenhoe@mysql.com>2006-06-28 08:32:41 -0700
commit91eaf88ee66b925afcb8c14c57e596fa9e2f8266 (patch)
tree68fa1ae05661b41f933d69130f63d3242870349a /scripts
parentcfc1040115f7977f13e8390f53eefefd73a75953 (diff)
parent04ca0e562fc6693bcdac12e44209f76304446a17 (diff)
downloadmariadb-git-91eaf88ee66b925afcb8c14c57e596fa9e2f8266.tar.gz
Merge igreenhoe@bk-internal.mysql.com:/home/bk/mysql-5.0-maint
into mysql.com:/home/greenman/workspace-mysql/mysql/pending/bug-5.0-17353
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
#