Commit d2a3420d authored by unknown's avatar unknown
Browse files

A fix (bug #6551: UMASK_DIR & UMASK not taken into account (mysqld.cc my_init.c inconsistency)). 

my_umask and my_umask_dir initialization has been moved to the my_init() func.


mysys/my_init.c:
  A fix (bug #6551: UMASK_DIR & UMASK not taken into account (mysqld.cc my_init.c inconsistency))
sql/mysqld.cc:
  A fix (bug #6551: UMASK_DIR & UMASK not taken into account (mysqld.cc my_init.c inconsistency))
parent 02d8fa29

mysys/my_init.c

+2 −0
Original line number Diff line number Diff line
@@ -75,6 +75,8 @@ my_bool my_init(void) 
    return 0;

  my_init_done=1;

  mysys_usage_id++;

  my_umask= 0660;                       /* Default umask for new files */

  my_umask_dir= 0700;                   /* Default umask for new directories */

#if defined(THREAD) && defined(SAFE_MUTEX)

  safe_mutex_global_init();		/* Must be called early */

#endif

sql/mysqld.cc

+0 −2
Original line number Diff line number Diff line
@@ -2305,8 +2305,6 @@ bool init_global_datetime_format(timestamp_type format_type, 
static int init_common_variables(const char *conf_file_name, int argc,

				 char **argv, const char **groups)

{

  my_umask=0660;		// Default umask for new files

  my_umask_dir=0700;		// Default umask for new directories

  umask(((~my_umask) & 0666));

  tzset();			// Set tzname