Commit f4a0f179 authored by monty@hundin.mysql.fi's avatar monty@hundin.mysql.fi

.

Changed usage of sumlink/realpath  in fn_format() to be compatbile
with old MySQL code
parent ad0b92f9
...@@ -96,14 +96,13 @@ my_string fn_format(my_string to, const char *name, const char *dsk, ...@@ -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 */
......
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