Commit c9b88730 authored by unknown's avatar unknown

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
parents 4a07ed48 a266c16d
...@@ -56,11 +56,13 @@ File my_create_with_symlink(const char *linkname, const char *filename, ...@@ -56,11 +56,13 @@ File my_create_with_symlink(const char *linkname, const char *filename,
{ {
if (!access(filename,F_OK)) if (!access(filename,F_OK))
{ {
my_errno= errno= EEXIST;
my_error(EE_CANTCREATEFILE, MYF(0), filename, EEXIST); my_error(EE_CANTCREATEFILE, MYF(0), filename, EEXIST);
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
if (create_link && !access(linkname,F_OK)) if (create_link && !access(linkname,F_OK))
{ {
my_errno= errno= EEXIST;
my_error(EE_CANTCREATEFILE, MYF(0), linkname, EEXIST); my_error(EE_CANTCREATEFILE, MYF(0), linkname, EEXIST);
DBUG_RETURN(-1); DBUG_RETURN(-1);
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment