diff options
author | unknown <serg@serg.mylan> | 2004-12-10 18:49:36 +0100 |
---|---|---|
committer | unknown <serg@serg.mylan> | 2004-12-10 18:49:36 +0100 |
commit | 92a8bd936103f43bd6c9f4cce60ff594cd64b89f (patch) | |
tree | ad1e018ba9444a34da465721fa2f944ce34a6ae9 /sql/sql_class.cc | |
parent | 7a60d1558a89df5f198884d360a14bf2b48f2c49 (diff) | |
parent | c486461e4430ced16300cc86c007a8d1d980af93 (diff) | |
download | mariadb-git-92a8bd936103f43bd6c9f4cce60ff594cd64b89f.tar.gz |
manually merged
innobase/dict/dict0dict.c:
merged (ul)
innobase/include/dict0dict.h:
merged (ul)
sql/ha_innodb.cc:
merged (ul)
sql/log.cc:
automerged
Diffstat (limited to 'sql/sql_class.cc')
-rw-r--r-- | sql/sql_class.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_class.cc b/sql/sql_class.cc index 7512e661ea7..596097d9dc2 100644 --- a/sql/sql_class.cc +++ b/sql/sql_class.cc @@ -961,7 +961,7 @@ static File create_file(THD *thd, char *path, sql_exchange *exchange, return -1; } /* Create the file world readable */ - if ((file= my_create(path, 0666, O_WRONLY, MYF(MY_WME))) < 0) + if ((file= my_create(path, 0666, O_WRONLY|O_EXCL, MYF(MY_WME))) < 0) return file; #ifdef HAVE_FCHMOD (void) fchmod(file, 0666); // Because of umask() |