summaryrefslogtreecommitdiff
path: root/mysys/mf_format.c
diff options
context:
space:
mode:
authormonty@donna.mysql.com <>2000-09-20 04:59:34 +0300
committermonty@donna.mysql.com <>2000-09-20 04:59:34 +0300
commit2780278f35ae9ec1a73fb4d5ecedecf9f44d0c8b (patch)
tree47e17b2858b02fa9f69cb087e6add8a937bbd62f /mysys/mf_format.c
parentb4e2076bed1d068656cd7e6b4f9d3009074a7c8b (diff)
parentdc4525636ce2912fb9a455503260760621e2eb46 (diff)
downloadmariadb-git-2780278f35ae9ec1a73fb4d5ecedecf9f44d0c8b.tar.gz
merge
Diffstat (limited to 'mysys/mf_format.c')
-rw-r--r--mysys/mf_format.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/mysys/mf_format.c b/mysys/mf_format.c
index aa4d469e20c..63e1b3cb1ba 100644
--- a/mysys/mf_format.c
+++ b/mysys/mf_format.c
@@ -96,13 +96,14 @@ my_string fn_format(my_string to, const char *name, const char *dsk,
bmove(buff,(char*) name,length); /* Save name for last copy */
name=buff;
}
- (void) strmov(strnmov(strmov(to,dev),name,length),ext);
+ pos=strnmov(strmov(to,dev),name,length);
#ifdef FN_UPPER_CASE
caseup_str(to);
#endif
#ifdef FN_LOWER_CASE
casedn_str(to);
#endif
+ (void) strmov(pos,ext); /* Don't convert extension */
}
/* Purify gives a lot of UMR errors when using realpath */
#if defined(HAVE_REALPATH) && !defined(HAVE_purify)