summaryrefslogtreecommitdiff
path: root/mysys
diff options
context:
space:
mode:
authormonty@mysql.com <>2003-12-13 04:04:38 +0200
committermonty@mysql.com <>2003-12-13 04:04:38 +0200
commitbd92d9b9ae2469accf5ebe0aa0597fbeb117aa3b (patch)
treecf05e1e4ec36f367ed2af0f1637a851099cc54ba /mysys
parent500192aef39472593768298eccaabbf2992d99b3 (diff)
parentf995a5f4aa919d6d229d29fb652a263d8c816430 (diff)
downloadmariadb-git-bd92d9b9ae2469accf5ebe0aa0597fbeb117aa3b.tar.gz
Merge
Diffstat (limited to 'mysys')
-rw-r--r--mysys/my_symlink2.c12
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))