summaryrefslogtreecommitdiff
path: root/merge
diff options
context:
space:
mode:
authorserg@serg.mylan <>2005-03-03 19:51:29 +0100
committerserg@serg.mylan <>2005-03-03 19:51:29 +0100
commit8d9a53a78c78d7d008f0ef7ccaea11c47a8f3fa4 (patch)
tree6a871c4d1335ae125f6cd13af89645ec25365e37 /merge
parentb64fdf882aa6ee5dc6b7f033c11bbd30d5630b60 (diff)
downloadmariadb-git-8d9a53a78c78d7d008f0ef7ccaea11c47a8f3fa4.tar.gz
Fixes for bugs reported by Stefano Di Paola (stefano.dipaola@wisec.it)
Diffstat (limited to 'merge')
-rw-r--r--merge/mrg_create.c2
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)