summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGeorgi Kodinov <joro@sun.com>2010-04-09 14:47:18 +0300
committerGeorgi Kodinov <joro@sun.com>2010-04-09 14:47:18 +0300
commit17a21c4f35812eba71a44e906e18ec947517cf35 (patch)
treef02552bc470e100352e6c4cdb9abfc1d0dbbe472 /include
parent24a9fb555c6c471222598688fcaf8d5405fea531 (diff)
downloadmariadb-git-17a21c4f35812eba71a44e906e18ec947517cf35.tar.gz
Bug #47095: Can't open_files_limit really be larger than 65535?
Several problems addressed: 1. The maximum value for --open_files_limit on non-windows boxes is now raised to UINT_MAX (the maximum possible without significant changes in the code). The maximum value on windows is kept to be 2048 due to a known limitation (bug 24509). 2. mysqld_safe now supports --open_files_limit=xx in addition to --open-files-limit=xx 3. mysqld_safe always passes through --open[_-]files[_-]limit to the underlying mysqld. It used to pass it through only if it the user running the script has access to the root directory or there was an --user argument specified. 4. Fixed a prototype in my_file.c to match its counterpart in the other #ifdef branch.
Diffstat (limited to 'include')
-rw-r--r--include/my_global.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/my_global.h b/include/my_global.h
index 779152203be..e4e53aca20a 100644
--- a/include/my_global.h
+++ b/include/my_global.h
@@ -751,7 +751,7 @@ typedef SOCKET_SIZE_TYPE size_socket;
#endif
#define MY_NFILE 64 /* This is only used to save filenames */
#ifndef OS_FILE_LIMIT
-#define OS_FILE_LIMIT 65535
+#define OS_FILE_LIMIT UINT_MAX
#endif
/* #define EXT_IN_LIBNAME */