diff options
| author | ram@gw.mysql.r18.ru <> | 2004-11-11 12:35:55 +0400 |
|---|---|---|
| committer | ram@gw.mysql.r18.ru <> | 2004-11-11 12:35:55 +0400 |
| commit | 1d967b8dcf86ea644dabd39b9f0fe0695ec79c17 (patch) | |
| tree | 978e414fdeefacdc46917ff656fd8080d8f1198c | |
| parent | 582f9a8900e6a58ba361e71be83aa580e6cfd98e (diff) | |
| download | mariadb-git-1d967b8dcf86ea644dabd39b9f0fe0695ec79c17.tar.gz | |
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.
| -rw-r--r-- | mysys/my_init.c | 2 | ||||
| -rw-r--r-- | sql/mysqld.cc | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/mysys/my_init.c b/mysys/my_init.c index e9a61b1833c..c32fcfe6a09 100644 --- a/mysys/my_init.c +++ b/mysys/my_init.c @@ -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 diff --git a/sql/mysqld.cc b/sql/mysqld.cc index 5622ac50a7b..4b70e8552b5 100644 --- a/sql/mysqld.cc +++ b/sql/mysqld.cc @@ -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 |