diff options
author | unknown <knielsen@knielsen-hq.org> | 2009-11-06 18:22:32 +0100 |
---|---|---|
committer | unknown <knielsen@knielsen-hq.org> | 2009-11-06 18:22:32 +0100 |
commit | ad368a2b54f4177daf5abd17fa7533f1626f6feb (patch) | |
tree | c762060dc3c06f7b35460ef22fecc08cf8adee55 /mysys/my_copy.c | |
parent | 716c09936365c9cfeb2304ca54ffdd95c1031c6e (diff) | |
parent | a6793a48e20c2aebb1391e2f4f916cf147ff1900 (diff) | |
download | mariadb-git-ad368a2b54f4177daf5abd17fa7533f1626f6feb.tar.gz |
Merge Mysql 5.1.39 merge into MariaDB trunk
Diffstat (limited to 'mysys/my_copy.c')
-rw-r--r-- | mysys/my_copy.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/my_copy.c b/mysys/my_copy.c index cb2fbf00f3e..62f60e9ce95 100644 --- a/mysys/my_copy.c +++ b/mysys/my_copy.c @@ -57,6 +57,7 @@ int my_copy(const char *from, const char *to, myf MyFlags) File from_file,to_file; uchar buff[IO_SIZE]; MY_STAT stat_buff,new_stat_buff; + int res; DBUG_ENTER("my_copy"); DBUG_PRINT("my",("from %s to %s MyFlags %d", from, to, MyFlags)); @@ -95,7 +96,7 @@ int my_copy(const char *from, const char *to, myf MyFlags) if (MyFlags & MY_HOLD_ORIGINAL_MODES && !new_file_stat) DBUG_RETURN(0); /* File copyed but not stat */ - VOID(chmod(to, stat_buff.st_mode & 07777)); /* Copy modes */ + res= chmod(to, stat_buff.st_mode & 07777); /* Copy modes */ #if !defined(__WIN__) && !defined(__NETWARE__) if (chown(to, stat_buff.st_uid,stat_buff.st_gid)) { |