diff options
author | unknown <monty@mashka.mysql.fi> | 2002-10-29 23:54:37 +0200 |
---|---|---|
committer | unknown <monty@mashka.mysql.fi> | 2002-10-29 23:54:37 +0200 |
commit | 60d46b90867e9712c70d9e582784b335fbeb2e67 (patch) | |
tree | 7459abcf2b29e1c59d1ecb93ef0a42fdc01adbfb /scripts | |
parent | 2d9a473bb67eb5d46ef3facf9384e2b9a621b79e (diff) | |
parent | 31ba88c0c17e7a3eca365f104e2f129af7f07ee5 (diff) | |
download | mariadb-git-60d46b90867e9712c70d9e582784b335fbeb2e67.tar.gz |
merge
include/my_global.h:
Auto merged
sql/mysqld.cc:
Auto merged
sql/sql_select.cc:
Auto merged
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/mysqld_safe.sh | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/scripts/mysqld_safe.sh b/scripts/mysqld_safe.sh index 9dea2eb3935..f51eff6585f 100644 --- a/scripts/mysqld_safe.sh +++ b/scripts/mysqld_safe.sh @@ -215,6 +215,7 @@ then if test -n "$open_files" then ulimit -n $open_files + args="open-files-limit=$open_files $args" fi if test -n "$core_file_size" then |