summaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
authorunknown <cmiller@zippy.(none)>2006-07-13 11:11:20 -0400
committerunknown <cmiller@zippy.(none)>2006-07-13 11:11:20 -0400
commit3ff8200ac17fda202b2adc0a4f7a2bb91c8078d0 (patch)
treeabade15123a2fd253ad9ebc948ac5aeeaacd3181 /scripts
parenta7dddd3b67e70292c0813e80ad255f1dc2f3a867 (diff)
parent4823bc50413d11a1f8329db9cde5bc5173d365c8 (diff)
downloadmariadb-git-3ff8200ac17fda202b2adc0a4f7a2bb91c8078d0.tar.gz
Merge zippy.(none):/home/cmiller/work/mysql/merge/mysql-5.0
into zippy.(none):/home/cmiller/work/mysql/m50-maint--07C2P configure.in: Auto merged mysql-test/mysql-test-run.pl: Auto merged tests/mysql_client_test.c: manual merge
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
#