diff options
| author | unknown <monty@mysql.com> | 2003-12-13 04:04:38 +0200 |
|---|---|---|
| committer | unknown <monty@mysql.com> | 2003-12-13 04:04:38 +0200 |
| commit | db37aa2297d30c339b1d6128f26fe437ae89a605 (patch) | |
| tree | cf05e1e4ec36f367ed2af0f1637a851099cc54ba /mysys | |
| parent | cbc18a76c83365240b0bb684b8b0990ca6d4797d (diff) | |
| parent | 759ea82ee1335543da1d484d76468b6686057e90 (diff) | |
| download | mariadb-git-db37aa2297d30c339b1d6128f26fe437ae89a605.tar.gz | |
Merge
sql/sql_select.cc:
Auto merged
sql/sql_update.cc:
Auto merged
mysql-test/r/multi_update.result:
SCCS merged
mysql-test/t/multi_update.test:
SCCS merged
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_symlink2.c | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c index 68b034bec5c..913f632fbb4 100644 --- a/mysys/my_symlink2.c +++ b/mysys/my_symlink2.c @@ -31,9 +31,19 @@ File my_create_with_symlink(const char *linkname, const char *filename, File file; int tmp_errno; /* Test if we should create a link */ - int create_link=(linkname && strcmp(linkname,filename)); + int create_link; DBUG_ENTER("my_create_with_symlink"); + if (my_disable_symlinks) + { + /* Create only the file, not the link and file */ + create_link= 0; + if (linkname) + filename= linkname; + } + else + create_link= (linkname && strcmp(linkname,filename)); + if (!(MyFlags & MY_DELETE_OLD)) { if (!access(filename,F_OK)) |