diff options
| author | unknown <monty@donna.mysql.com> | 2000-09-20 04:59:34 +0300 |
|---|---|---|
| committer | unknown <monty@donna.mysql.com> | 2000-09-20 04:59:34 +0300 |
| commit | 5993b4947b23e4aca2dfc7b7f92b30f14e56c04f (patch) | |
| tree | 47e17b2858b02fa9f69cb087e6add8a937bbd62f /mysys/mf_format.c | |
| parent | 96b2e908528a5532eb89468569a6db302182d37c (diff) | |
| parent | 5a2419eb89d2f617e94ebef64ffbef72417ec94c (diff) | |
| download | mariadb-git-5993b4947b23e4aca2dfc7b7f92b30f14e56c04f.tar.gz | |
merge
mysys/mf_format.c:
Auto merged
sql/ha_myisam.cc:
Auto merged
sql/mysql_priv.h:
Auto merged
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysys/mf_format.c')
| -rw-r--r-- | mysys/mf_format.c | 3 |
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) |