diff options
| author | unknown <jimw@mysql.com> | 2005-03-03 15:01:46 -0800 |
|---|---|---|
| committer | unknown <jimw@mysql.com> | 2005-03-03 15:01:46 -0800 |
| commit | daaeeedb499cd27ff0279d8321808cdbccdd7e09 (patch) | |
| tree | d9fcf7c0806dd22a5d3dc0996b6c7b4ff240cbb9 /mysys | |
| parent | 80b474bfc0c77ae2a4b477b15ac6681b05d33e6d (diff) | |
| parent | 92895d00527f62a57ed569f85df01dbf4f0db9c3 (diff) | |
| download | mariadb-git-daaeeedb499cd27ff0279d8321808cdbccdd7e09.tar.gz | |
Merged from 4.1
innobase/os/os0file.c:
Auto merged
innobase/srv/srv0start.c:
Auto merged
mysql-test/r/bigint.result:
Auto merged
mysql-test/r/mysqldump.result:
Auto merged
mysql-test/r/symlink.result:
Auto merged
mysql-test/t/mysqldump.test:
Auto merged
mysql-test/t/symlink.test:
Auto merged
ndb/src/kernel/blocks/dbtc/DbtcMain.cpp:
Auto merged
ndb/test/ndbapi/testNodeRestart.cpp:
Auto merged
ndb/test/run-test/daily-devel-tests.txt:
Auto merged
sql/item.h:
Auto merged
strings/ctype-win1250ch.c:
Auto merged
mysql-test/r/grant2.result:
Hand-merged new test
mysql-test/t/grant2.test:
Hand-merged new test
ndb/include/ndbapi/NdbTransaction.hpp:
Used 5.0 version per tomas
sql/sql_acl.cc:
Merge fix for Bug #3309.
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_symlink2.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c index 913f632fbb4..80dca7d56ac 100644 --- a/mysys/my_symlink2.c +++ b/mysys/my_symlink2.c @@ -32,6 +32,7 @@ File my_create_with_symlink(const char *linkname, const char *filename, int tmp_errno; /* Test if we should create a link */ int create_link; + char abs_linkname[FN_REFLEN]; DBUG_ENTER("my_create_with_symlink"); if (my_disable_symlinks) @@ -42,7 +43,11 @@ File my_create_with_symlink(const char *linkname, const char *filename, filename= linkname; } else - create_link= (linkname && strcmp(linkname,filename)); + { + if (linkname) + my_realpath(&abs_linkname, linkname, MYF(0)); + create_link= (linkname && strcmp(abs_linkname,filename)); + } if (!(MyFlags & MY_DELETE_OLD)) { |