diff options
| author | Alfranio Correia <alfranio.correia@sun.com> | 2009-05-21 09:36:38 +0100 |
|---|---|---|
| committer | Alfranio Correia <alfranio.correia@sun.com> | 2009-05-21 09:36:38 +0100 |
| commit | 9ce928de59cc18e69de588929e9b6e5abf07e733 (patch) | |
| tree | f98c003529e01890b754db89407ac3bfecf513aa /mysys | |
| parent | 60955e54a2514decef0369350969f5d06414e688 (diff) | |
| parent | f6eb9426ce9ba72e5a6d74755734d22aadba32e0 (diff) | |
| download | mariadb-git-9ce928de59cc18e69de588929e9b6e5abf07e733.tar.gz | |
auto-merge 5.1-bugteam (local) --> 5.1-bugteam
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 f199132626b..6afa2938fa3 100644 --- a/mysys/mf_format.c +++ b/mysys/mf_format.c @@ -79,7 +79,7 @@ char * fn_format(char * to, const char *name, const char *dir, /* To long path, return original or NULL */ size_t tmp_length; if (flag & MY_SAFE_PATH) - return NullS; + DBUG_RETURN(NullS); tmp_length= strlength(startpos); DBUG_PRINT("error",("dev: '%s' ext: '%s' length: %u",dev,ext, (uint) length)); |