diff options
-rw-r--r-- | mysys/default.c | 3 | ||||
-rw-r--r-- | support-files/MacOSX/ReadMe.txt | 3 |
2 files changed, 3 insertions, 3 deletions
diff --git a/mysys/default.c b/mysys/default.c index a3942425b7d..26121cc0e56 100644 --- a/mysys/default.c +++ b/mysys/default.c @@ -249,7 +249,8 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, MY_STAT stat_info; if (!my_stat(name,&stat_info,MYF(0))) return 0; - if (stat_info.st_mode & S_IWOTH) /* ignore world-writeable files */ + /* ignore world-writeable _regular_ files */ + if (stat_info.st_mode & S_IWOTH && stat_info.st_mode & S_IFREG) { fprintf(stderr, "warning: World-writeable config file %s is ignored\n", name); diff --git a/support-files/MacOSX/ReadMe.txt b/support-files/MacOSX/ReadMe.txt index a18c5f3aa41..8b7b7019bd4 100644 --- a/support-files/MacOSX/ReadMe.txt +++ b/support-files/MacOSX/ReadMe.txt @@ -76,5 +76,4 @@ can to add this directory to your PATH environment variable in your login script. For the default shell "tcsh", you can do this by running this command once: -echo 'setenv PATH $PATH:/usr/local/mysql/bin' >> ~/.tcshrc - +echo 'setenv PATH ${PATH}:/usr/local/mysql/bin' >> ~/.tcshrc |