diff options
author | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-02 16:38:04 -0300 |
---|---|---|
committer | Davi Arnaut <Davi.Arnaut@Sun.COM> | 2010-07-02 16:38:04 -0300 |
commit | 5641fb64b4719774f6c4ba4c1ec85fa5312c5ecf (patch) | |
tree | 3c6e29d5a9d1f0a067dcdf4cca5b5747721aee89 /mysys/mf_loadpath.c | |
parent | aa4357f3944032ab95137d52342bc7673159fc64 (diff) | |
parent | 0eb26fdfa83d2ddd5f3dc3f8cf6e372a55b4c270 (diff) | |
download | mariadb-git-5641fb64b4719774f6c4ba4c1ec85fa5312c5ecf.tar.gz |
Merge of mysql-5.1-bugteam into mysql-trunk-merge.
Diffstat (limited to 'mysys/mf_loadpath.c')
-rw-r--r-- | mysys/mf_loadpath.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/mysys/mf_loadpath.c b/mysys/mf_loadpath.c index 07851ab6e92..9350babc176 100644 --- a/mysys/mf_loadpath.c +++ b/mysys/mf_loadpath.c @@ -42,7 +42,7 @@ char * my_load_path(char * to, const char *path, if (is_cur) is_cur=2; /* Remove current dir */ if (! my_getwd(buff,(uint) (FN_REFLEN-strlen(path)+is_cur),MYF(0))) - (void) strncat(buff, path+is_cur, FN_REFLEN); + (void) strncat(buff, path+is_cur, FN_REFLEN-1); else (void) strnmov(buff, path, FN_REFLEN); /* Return org file name */ } |