diff options
| author | unknown <hf@deer.(none)> | 2004-09-14 10:04:35 +0500 |
|---|---|---|
| committer | unknown <hf@deer.(none)> | 2004-09-14 10:04:35 +0500 |
| commit | ded743366a9ffc4b43a160a9688ce204f197a123 (patch) | |
| tree | 680ecd15801b71ed4fcc541dbb70b72366817e99 /mysys | |
| parent | f0e23df61a0b5fb4a41f8dd46605b5b5f9545b05 (diff) | |
| parent | c7431f4c262182e980911ed6acb5de05ec9698fa (diff) | |
| download | mariadb-git-ded743366a9ffc4b43a160a9688ce204f197a123.tar.gz | |
Merging
sql/sql_table.cc:
Auto merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/mf_format.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_format.c b/mysys/mf_format.c index 114e19759c8..d1ca1108d02 100644 --- a/mysys/mf_format.c +++ b/mysys/mf_format.c @@ -42,7 +42,7 @@ my_string fn_format(my_string to, const char *name, const char *dir, /* Use given directory */ convert_dirname(dev,dir,NullS); /* Fix to this OS */ } - else if ((flag & MY_RELATIVE_PATH) && !test_if_hard_path(name)) + else if ((flag & MY_RELATIVE_PATH) && !test_if_hard_path(dev)) { /* Put 'dir' before the given path */ strmake(buff,dev,sizeof(buff)-1); |