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 /isam | |
| 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 'isam')
| -rw-r--r-- | isam/create.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/isam/create.c b/isam/create.c index 4c23f3edd11..204d3157d00 100644 --- a/isam/create.c +++ b/isam/create.c @@ -58,13 +58,14 @@ int nisam_create(const char *name,uint keys,N_KEYDEF *keyinfo, base_pos=512; /* Enough for N_STATE_INFO */ bzero((byte*) &share,sizeof(share)); if ((file = my_create(fn_format(buff,name,"",N_NAME_IEXT,4),0, - O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + O_RDWR | O_EXCL | O_NOFOLLOW,MYF(MY_WME))) < 0) goto err; errpos=1; VOID(fn_format(buff,name,"",N_NAME_DEXT,2+4)); if (!(flags & HA_DONT_TOUCH_DATA)) { - if ((dfile = my_create(buff,0,O_RDWR | O_TRUNC,MYF(MY_WME))) < 0) + if ((dfile = my_create(buff,0,O_RDWR | O_EXCL | O_NOFOLLOW, + MYF(MY_WME))) < 0) goto err; errpos=2; } |