1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge work:/home/bk/mysql-4.0 into hundin.mysql.fi:/my/bk/mysql-4.0

Browse Source
This commit is contained in:
unknown 2001-06-04 15:16:41 +03:00
commit c866beb513
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
mysys/mf_format.c
View File

@ -96,14 +96,13 @@ my_string fn_format(my_string to, const char *name, const char *dsk,
#endif #endif
(void) strmov(pos,ext); /* Don't convert extension */ (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); 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); DBUG_RETURN (to);
} /* fn_format */ } /* fn_format */