From f4a0f179ea6dc9ba362147aed33f27b14d33dbfe Mon Sep 17 00:00:00 2001
From: "monty@hundin.mysql.fi" <>
Date: Mon, 4 Jun 2001 15:16:26 +0300
Subject: . Changed usage of sumlink/realpath  in fn_format() to be compatbile
 with old MySQL code

---
 mysys/mf_format.c | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'mysys/mf_format.c')

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 */
 
-- 
cgit v1.2.1