diff options
| author | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-11 11:17:42 +0400 |
|---|---|---|
| committer | Alexey Kopytov <Alexey.Kopytov@Sun.com> | 2010-04-11 11:17:42 +0400 |
| commit | 1a909d3c71784af1a8204c70ef292f55d6201344 (patch) | |
| tree | 9e8865e4297ebff57bac639031c2ed3e115be98a /scripts | |
| parent | 04be415ac887933cb0e6d1e025304b9cebdc1a8d (diff) | |
| parent | 11ca63fccc864b80ba75f5c16ea37238e30b50d6 (diff) | |
| download | mariadb-git-1a909d3c71784af1a8204c70ef292f55d6201344.tar.gz | |
Automerge of mysql-5.1-bugteam to mysql-trunk-merge.
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/mysqld_safe.sh | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 5420ebd908e..248503905c1 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -199,6 +199,7 @@ parse_arguments() { ;; --nice=*) niceness="$val" ;; --open-files-limit=*) open_files="$val" ;; + --open_files_limit=*) open_files="$val" ;; --skip-kill-mysqld*) KILL_MYSQLD=0 ;; --syslog) want_syslog=1 ;; --skip-syslog) want_syslog=0 ;; @@ -545,10 +546,14 @@ then if test -n "$open_files" then ulimit -n $open_files - append_arg_to_args "--open-files-limit=$open_files" fi fi +if test -n "$open_files" +then + append_arg_to_args "--open-files-limit=$open_files" +fi + safe_mysql_unix_port=${mysql_unix_port:-${MYSQL_UNIX_PORT:-@MYSQL_UNIX_ADDR@}} # Make sure that directory for $safe_mysql_unix_port exists mysql_unix_port_dir=`dirname $safe_mysql_unix_port` |