diff options
author | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-18 15:57:17 +0300 |
---|---|---|
committer | unknown <gkodinov/kgeorge@magare.gmz> | 2007-07-18 15:57:17 +0300 |
commit | c9b88730e4999f88ea19fea8a100b08ae8bfad85 (patch) | |
tree | f561cebcb19d78861653fbe326113a5c9e2f006e /mysys/my_symlink2.c | |
parent | 4a07ed48ddb8a7fd8d6a1c786d67377289b8263b (diff) | |
parent | a266c16d14a82b601f60c1987f5a9c6c779215e4 (diff) | |
download | mariadb-git-c9b88730e4999f88ea19fea8a100b08ae8bfad85.tar.gz |
Merge magare.gmz:/home/kgeorge/mysql/work/B29325-my_errno-5.0-opt
into magare.gmz:/home/kgeorge/mysql/work/merge-5.0-5.1-opt
mysys/my_symlink2.c:
Auto merged
Diffstat (limited to 'mysys/my_symlink2.c')
-rw-r--r-- | mysys/my_symlink2.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c index 6ea22790998..2a46fb3abea 100644 --- a/mysys/my_symlink2.c +++ b/mysys/my_symlink2.c @@ -56,11 +56,13 @@ File my_create_with_symlink(const char *linkname, const char *filename, { if (!access(filename,F_OK)) { + my_errno= errno= EEXIST; my_error(EE_CANTCREATEFILE, MYF(0), filename, EEXIST); DBUG_RETURN(-1); } if (create_link && !access(linkname,F_OK)) { + my_errno= errno= EEXIST; my_error(EE_CANTCREATEFILE, MYF(0), linkname, EEXIST); DBUG_RETURN(-1); } |