Merge lgrimmer@build.mysql.com:/home/bk/mysql-4.0

into mysql.com:/space/my/mysql-4.0

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);

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