diff options
| author | Staale Smedseng <staale.smedseng@sun.com> | 2009-08-28 18:21:54 +0200 |
|---|---|---|
| committer | Staale Smedseng <staale.smedseng@sun.com> | 2009-08-28 18:21:54 +0200 |
| commit | f59ef9eafa076cd5d3ae3aedc609efa457492ebe (patch) | |
| tree | a1ec5dfbd668a88bc0b6c98db397a421d2b37f21 /mysys/my_copy.c | |
| parent | a0e44ec1e8d2352df6dbf40c959e2115c9884c7e (diff) | |
| parent | 2217de25139f5994fc1c5c71f897ff0788813db0 (diff) | |
| download | mariadb-git-f59ef9eafa076cd5d3ae3aedc609efa457492ebe.tar.gz | |
Merge from 5.0 for 43414
Diffstat (limited to 'mysys/my_copy.c')
| -rw-r--r-- | mysys/my_copy.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/mysys/my_copy.c b/mysys/my_copy.c index 5679d13d39d..64f1623aa59 100644 --- a/mysys/my_copy.c +++ b/mysys/my_copy.c @@ -56,6 +56,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)); @@ -94,9 +95,9 @@ 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__) - VOID(chown(to, stat_buff.st_uid,stat_buff.st_gid)); /* Copy ownership */ + res= chown(to, stat_buff.st_uid,stat_buff.st_gid); /* Copy ownership */ #endif #if !defined(VMS) && !defined(__ZTC__) if (MyFlags & MY_COPYTIME) |