Commit a032dc27 authored by unknown's avatar unknown
Browse files

Merge bk-internal:/home/bk/mysql-3.23/ 

into serg.mysql.com:/usr/home/serg/Abk/mysql
parents 73c2d4ad dc3bd073

mysys/default.c

+13 −2
Original line number Diff line number Diff line
@@ -39,6 +39,7 @@ 
#include "mysys_priv.h"

#include "m_string.h"

#include "m_ctype.h"

#include <my_dir.h>



char *defaults_extra_file=0;
@@ -241,6 +242,16 @@ static my_bool search_default_file(DYNAMIC_ARRAY *args, MEM_ROOT *alloc, 
  {

    strmov(name,config_file);

  }

  fn_format(name,name,"","",4);

#if !defined(__WIN__) && !defined(OS2)

  {

    MY_STAT stat_info;

    if (!my_stat(name,&stat_info,MYF(MY_WME)))

      return 0;

    if (stat_info.st_mode & S_IWOTH) /* ignore world-writeable files */

      return 0;

  }

#endif

  if (!(fp = my_fopen(fn_format(name,name,"","",4),O_RDONLY,MYF(0))))

    return 0;					/* Ignore wrong files */