diff options
| author | unknown <serg@serg.mylan> | 2005-03-03 23:07:20 +0100 |
|---|---|---|
| committer | unknown <serg@serg.mylan> | 2005-03-03 23:07:20 +0100 |
| commit | 9210c01caca1053755476b35cf25d777ce3de7b5 (patch) | |
| tree | 55707388340dadccc4056126d6e229f3d2c7791e /merge | |
| parent | 560968258f615959419102de6d86707545c69655 (diff) | |
| parent | 9a420a4f7b5e8d375d405f45424ee7f40b55c357 (diff) | |
| download | mariadb-git-9210c01caca1053755476b35cf25d777ce3de7b5.tar.gz | |
merge
include/my_global.h:
Auto merged
mysys/mf_tempfile.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/share/english/errmsg.txt:
Auto merged
sql/table.cc:
Auto merged
Diffstat (limited to 'merge')
| -rw-r--r-- | merge/mrg_create.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/merge/mrg_create.c b/merge/mrg_create.c index d55a1421647..3508b7967f4 100644 --- a/merge/mrg_create.c +++ b/merge/mrg_create.c @@ -33,7 +33,7 @@ int mrg_create(const char *name, const char**table_names) errpos=0; if ((file = my_create(fn_format(buff,name,"",MRG_NAME_EXT,4),0, - O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + O_RDWR | O_EXCL | O_NOFOLLOW,MYF(MY_WME))) < 0) goto err; errpos=1; if (table_names) |