diff options
| author | monty@mashka.mysql.fi <> | 2004-02-19 19:33:09 +0200 |
|---|---|---|
| committer | monty@mashka.mysql.fi <> | 2004-02-19 19:33:09 +0200 |
| commit | e347f63192874ee5d3123f7bf078a05fecc5ef58 (patch) | |
| tree | 86d1d367349c537e9cbd45f6bf0ba3c2315f1a59 /mysys/my_fopen.c | |
| parent | 8a865250c4180ee197c4626560eb46c2cea0a696 (diff) | |
| download | mariadb-git-e347f63192874ee5d3123f7bf078a05fecc5ef58.tar.gz | |
Max open files handling moved to my_set_max_open_files()
This ensures that my_file_info takes this the max number of files into account and one can now use --open-files-limit on windows to increase number of used files up to 2048
Diffstat (limited to 'mysys/my_fopen.c')
| -rw-r--r-- | mysys/my_fopen.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mysys/my_fopen.c b/mysys/my_fopen.c index d3b0b90f9c5..8906a288b11 100644 --- a/mysys/my_fopen.c +++ b/mysys/my_fopen.c @@ -42,7 +42,7 @@ FILE *my_fopen(const char *FileName, int Flags, myf MyFlags) on some OS (SUNOS). Actually the filename save isn't that important so we can ignore if this doesn't work. */ - if ((uint) fileno(fd) >= MY_NFILE) + if ((uint) fileno(fd) >= my_file_limit) { thread_safe_increment(my_stream_opened,&THR_LOCK_open); DBUG_RETURN(fd); /* safeguard */ @@ -91,7 +91,7 @@ int my_fclose(FILE *fd, myf MyFlags) } else my_stream_opened--; - if ((uint) file < MY_NFILE && my_file_info[file].type != UNOPEN) + if ((uint) file < my_file_limit && my_file_info[file].type != UNOPEN) { my_file_info[file].type = UNOPEN; my_free(my_file_info[file].name, MYF(MY_ALLOW_ZERO_PTR)); @@ -123,11 +123,11 @@ FILE *my_fdopen(File Filedes, const char *name, int Flags, myf MyFlags) { pthread_mutex_lock(&THR_LOCK_open); my_stream_opened++; - if (Filedes < MY_NFILE) + if ((uint) Filedes < (uint) my_file_limit) { if (my_file_info[Filedes].type != UNOPEN) { - my_file_opened--; /* File is opened with my_open ! */ + my_file_opened--; /* File is opened with my_open ! */ } else { |