diff options
| author | monty@hundin.mysql.fi <> | 2001-06-04 15:16:41 +0300 |
|---|---|---|
| committer | monty@hundin.mysql.fi <> | 2001-06-04 15:16:41 +0300 |
| commit | a0b2ddd4dda959af15dc5462ab938eb29029b200 (patch) | |
| tree | ab95d3ddac00d83e427433977bccf2fc1dd4c625 | |
| parent | 1d05b8998070a23dd6f49a4885fe09f4cbc1fb8c (diff) | |
| parent | f4a0f179ea6dc9ba362147aed33f27b14d33dbfe (diff) | |
| download | mariadb-git-a0b2ddd4dda959af15dc5462ab938eb29029b200.tar.gz | |
Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0
| -rw-r--r-- | mysys/mf_format.c | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/mysys/mf_format.c b/mysys/mf_format.c index ebe6bfbe1e6..f90e646289f 100644 --- a/mysys/mf_format.c +++ b/mysys/mf_format.c @@ -96,14 +96,13 @@ my_string fn_format(my_string to, const char *name, const char *dsk, #endif (void) strmov(pos,ext); /* Don't convert extension */ } - if (flag & 16) + if (flag & 32) + (void) my_realpath(to, to, MYF(flag & 32 ? 0 : MY_RESOLVE_LINK)); + else if (flag & 16) { strmov(buff,to); - my_readlink(to, buff, MYF(flag & 32 ? 0 : MY_RESOLVE_LINK)); + (void) my_readlink(to, buff, MYF(0)); } - else if (flag & 32) - my_realpath(to, to, MYF(flag & 32 ? 0 : MY_RESOLVE_LINK)); - DBUG_RETURN (to); } /* fn_format */ |