diff options
| author | Alexander Barkov <bar@mariadb.org> | 2018-02-08 19:06:25 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2018-02-08 19:06:25 +0400 |
| commit | 3cad31f2a758f797ef0acac5625d0e007ecbce93 (patch) | |
| tree | 73c054636c4858b2a51eddf7eaa653746d67524e /mysys/my_lib.c | |
| parent | 560b9895d413bdfedda0a0ca871a635858990c05 (diff) | |
| parent | 5c057b3fef3aa92cfadbd63043799b430132a494 (diff) | |
| download | mariadb-git-3cad31f2a758f797ef0acac5625d0e007ecbce93.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'mysys/my_lib.c')
| -rw-r--r-- | mysys/my_lib.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/mysys/my_lib.c b/mysys/my_lib.c index 9c465fd5e68..5ab3facc348 100644 --- a/mysys/my_lib.c +++ b/mysys/my_lib.c @@ -119,10 +119,6 @@ MY_DIR *my_dir(const char *path, myf MyFlags) DBUG_ENTER("my_dir"); DBUG_PRINT("my",("path: '%s' MyFlags: %lu",path,MyFlags)); -#if !defined(HAVE_READDIR_R) - mysql_mutex_lock(&THR_LOCK_open); -#endif - tmp_file= directory_file_name(tmp_path, path); if (!(dirp= opendir(tmp_path))) @@ -174,9 +170,6 @@ MY_DIR *my_dir(const char *path, myf MyFlags) } (void) closedir(dirp); -#if !defined(HAVE_READDIR_R) - mysql_mutex_unlock(&THR_LOCK_open); -#endif if (MyFlags & MY_WANT_SORT) sort_dynamic(&dirh->array, (qsort_cmp) comp_names); @@ -187,9 +180,6 @@ MY_DIR *my_dir(const char *path, myf MyFlags) DBUG_RETURN(&dirh->dir); error: -#if !defined(HAVE_READDIR_R) - mysql_mutex_unlock(&THR_LOCK_open); -#endif my_errno=errno; if (dirp) (void) closedir(dirp); |