diff options
| author | Michael Widenius <monty@askmonty.org> | 2010-05-26 21:55:40 +0300 |
|---|---|---|
| committer | Michael Widenius <monty@askmonty.org> | 2010-05-26 21:55:40 +0300 |
| commit | 4aa9d903c11554cc4887eeffe7f0592c52e8bc99 (patch) | |
| tree | af3f0dfb833c3c4aabaa69ce50cfb64202ecd479 /mysys/my_symlink.c | |
| parent | 9febcb4776e563a93eb8fff247174b0e2eb2ae0b (diff) | |
| parent | af6d89a6aa9feb3545de068f461cf91bfb281dd2 (diff) | |
| download | mariadb-git-4aa9d903c11554cc4887eeffe7f0592c52e8bc99.tar.gz | |
Merge with MySQL 5.1.47
Fixed some bugs introduced in 5.1.47
Disabled some tests until we have merged with latest Xtradb
configure.in:
Added testing if valgrind/memcheck.h exists
storage/pbxt/src/ha_pbxt.cc:
LOCK_plugin is not anymore locked in init
Diffstat (limited to 'mysys/my_symlink.c')
| -rw-r--r-- | mysys/my_symlink.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mysys/my_symlink.c b/mysys/my_symlink.c index 258e227bb7b..33f45a882e1 100644 --- a/mysys/my_symlink.c +++ b/mysys/my_symlink.c @@ -117,6 +117,9 @@ int my_is_symlink(const char *filename __attribute__((unused))) /* Resolve all symbolic links in path 'to' may be equal to 'filename' + + to is guaranteed to never set to a string longer than FN_REFLEN + (including the end \0) */ int my_realpath(char *to, const char *filename, @@ -130,7 +133,7 @@ int my_realpath(char *to, const char *filename, DBUG_PRINT("info",("executing realpath")); if ((ptr=realpath(filename,buff))) - strmake(to,ptr,FN_REFLEN-1); + strmake(to, ptr, FN_REFLEN-1); else { /* |