diff options
| author | unknown <ingo@mysql.com> | 2005-03-04 11:37:45 +0100 |
|---|---|---|
| committer | unknown <ingo@mysql.com> | 2005-03-04 11:37:45 +0100 |
| commit | 7bd7643ab7b1df5de942422ef0a037718881b3b3 (patch) | |
| tree | be5541209e5f5e84db880427fffd18b0e7e9ceb8 /myisammrg | |
| parent | aec0408ba9634bc15be77b8507ca8b83ff609e24 (diff) | |
| parent | e54b545a966a92677242d6e6f904a10eb73cb707 (diff) | |
| download | mariadb-git-7bd7643ab7b1df5de942422ef0a037718881b3b3.tar.gz | |
Merge with after merge fix
BitKeeper/deleted/.del-create.c~96cecc433c0c2242:
Auto merged
include/my_global.h:
Auto merged
myisam/mi_create.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
BitKeeper/deleted/.del-errmsg.txt~f96b7055cac394e:
Auto merged
BitKeeper/deleted/.del-mrg_create.c~b747c8ec2b801f6:
Auto merged
sql/table.cc:
Auto merged
sql/sql_udf.cc:
After merge fix
Diffstat (limited to 'myisammrg')
| -rw-r--r-- | myisammrg/myrg_create.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/myisammrg/myrg_create.c b/myisammrg/myrg_create.c index 5fc3c60ff32..7ddb7ecb3b9 100644 --- a/myisammrg/myrg_create.c +++ b/myisammrg/myrg_create.c @@ -34,7 +34,7 @@ int myrg_create(const char *name, const char **table_names, errpos=0; if ((file = my_create(fn_format(buff,name,"",MYRG_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) |