summaryrefslogtreecommitdiff
path: root/mysys/my_open.c
diff options
context:
space:
mode:
authormonty@hundin.mysql.fi <>2001-09-27 22:02:37 +0300
committermonty@hundin.mysql.fi <>2001-09-27 22:02:37 +0300
commita4bc23add63c1eb20e6bb6cd65fa761b2ec2c19b (patch)
treeefc338d3f173438bf497cfc5ec22271876b39af5 /mysys/my_open.c
parentc3722dc1f4f4a6f74bd285b0ba59d4b82b0c52dc (diff)
downloadmariadb-git-a4bc23add63c1eb20e6bb6cd65fa761b2ec2c19b.tar.gz
Fixed bug in counting open files when using many files
Fixed bug in JOIN
Diffstat (limited to 'mysys/my_open.c')
-rw-r--r--mysys/my_open.c5
1 files changed, 2 insertions, 3 deletions
diff --git a/mysys/my_open.c b/mysys/my_open.c
index 2ed1af1eca1..748113528a1 100644
--- a/mysys/my_open.c
+++ b/mysys/my_open.c
@@ -75,8 +75,8 @@ int my_close(File fd, myf MyFlags)
pthread_mutex_destroy(&my_file_info[fd].mutex);
#endif
my_file_info[fd].type = UNOPEN;
- my_file_opened--;
}
+ my_file_opened--;
pthread_mutex_unlock(&THR_LOCK_open);
DBUG_RETURN(err);
} /* my_close */
@@ -96,9 +96,8 @@ File my_register_filename(File fd, const char *FileName, enum file_type
my_error(EE_OUT_OF_FILERESOURCES, MYF(ME_BELL+ME_WAITTANG),
FileName, my_errno);
return(-1);
-#else
- thread_safe_increment(my_file_opened,&THR_LOCK_open);
#endif
+ thread_safe_increment(my_file_opened,&THR_LOCK_open);
return(fd); /* safeguard */
}
pthread_mutex_lock(&THR_LOCK_open);