summaryrefslogtreecommitdiff
path: root/mysys/mf_dirname.c
diff options
context:
space:
mode:
authormonty@mysql.com <>2006-02-25 21:54:34 +0200
committermonty@mysql.com <>2006-02-25 21:54:34 +0200
commit1e2e9e28565d97f140f230824a1adfcea475ee34 (patch)
tree69f6c8a1a1bef870aa8b2cbe729b0fd87fcf1c31 /mysys/mf_dirname.c
parent066c7148fb5243a0533fd7b6edfe948cb1722548 (diff)
parent54274976e7b4a9a28e94a6f0b4f8d064140248db (diff)
downloadmariadb-git-1e2e9e28565d97f140f230824a1adfcea475ee34.tar.gz
Merge mysql.com:/home/my/mysql-5.0
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'mysys/mf_dirname.c')
-rw-r--r--mysys/mf_dirname.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_dirname.c b/mysys/mf_dirname.c
index 98da72a206c..378fe7080b8 100644
--- a/mysys/mf_dirname.c
+++ b/mysys/mf_dirname.c
@@ -109,7 +109,7 @@ char *convert_dirname(char *to, const char *from, const char *from_end)
#if FN_LIBCHAR != '/' || defined(FN_C_BEFORE_DIR_2)
{
- for (; *from && from != from_end; from++)
+ for (; from != from_end && *from ; from++)
{
if (*from == '/')
*to++= FN_LIBCHAR;