diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-01-19 19:22:00 +0200 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2018-01-19 19:22:00 +0200 |
| commit | ff979674e689266590672268692d85275a323e18 (patch) | |
| tree | ab7becd376adda341b65a1a43a96f78eec7a541c /mysys | |
| parent | 9007ca68738cb11b24854aa1bfa12dcd204a459d (diff) | |
| parent | fafdac3365f4943e73bcefd0e0d07d69997a9724 (diff) | |
| download | mariadb-git-ff979674e689266590672268692d85275a323e18.tar.gz | |
Merge tag 'mariadb-5.5.59' into 5.5-galera
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/default.c | 5 | ||||
| -rw-r--r-- | mysys/my_lib.c | 10 |
2 files changed, 3 insertions, 12 deletions
diff --git a/mysys/default.c b/mysys/default.c index 6f7ea583a1d..d42d4f44a13 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -1,4 +1,5 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2017, Oracle and/or its affiliates. All rights reserved. + Copyright (c) 2011, 2018, MariaDB Corporation This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -240,7 +241,7 @@ int my_search_option_files(const char *conf_file, int *argc, char ***argv, (char **) &my_defaults_group_suffix); if (! my_defaults_group_suffix) - my_defaults_group_suffix= getenv(STRINGIFY_ARG(DEFAULT_GROUP_SUFFIX_ENV)); + my_defaults_group_suffix= getenv("MYSQL_GROUP_SUFFIX"); if (forced_extra_defaults && !defaults_already_read) { diff --git a/mysys/my_lib.c b/mysys/my_lib.c index 71969f23d85..08ff6a94823 100644 --- a/mysys/my_lib.c +++ b/mysys/my_lib.c @@ -103,10 +103,6 @@ MY_DIR *my_dir(const char *path, myf MyFlags) DBUG_ENTER("my_dir"); DBUG_PRINT("my",("path: '%s' MyFlags: %d",path,MyFlags)); -#if !defined(HAVE_READDIR_R) - mysql_mutex_lock(&THR_LOCK_open); -#endif - dirp = opendir(directory_file_name(tmp_path,(char *) path)); #if defined(__amiga__) if ((dirp->dd_fd) < 0) /* Directory doesn't exists */ @@ -162,9 +158,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 result->dir_entry= (FILEINFO *)dir_entries_storage->buffer; result->number_off_files= dir_entries_storage->elements; @@ -174,9 +167,6 @@ MY_DIR *my_dir(const char *path, myf MyFlags) DBUG_RETURN(result); error: -#if !defined(HAVE_READDIR_R) - mysql_mutex_unlock(&THR_LOCK_open); -#endif my_errno=errno; if (dirp) (void) closedir(dirp); |