diff options
| author | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-03-20 18:11:56 +0530 |
|---|---|---|
| committer | Sachin Setiya <sachin.setiya@mariadb.com> | 2017-03-20 18:11:56 +0530 |
| commit | 9cf499724f38512630105974efab2ea8128345fd (patch) | |
| tree | 121b19bc15337a52541870fba87321bc50144332 /mysys | |
| parent | 53c6195eede2b9959331bf11fa7679a108896bde (diff) | |
| parent | 4c35dce2968ac715b72bb75c2d64d977868f718f (diff) | |
| download | mariadb-git-9cf499724f38512630105974efab2ea8128345fd.tar.gz | |
Merge branch '10.0' into bb-10.0-galera
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_context.c | 3 | ||||
| -rw-r--r-- | mysys/my_symlink2.c | 14 |
2 files changed, 8 insertions, 9 deletions
diff --git a/mysys/my_context.c b/mysys/my_context.c index 017cebdc110..29ba9f79c72 100644 --- a/mysys/my_context.c +++ b/mysys/my_context.c @@ -206,7 +206,8 @@ my_context_spawn(struct my_context *c, void (*f)(void *), void *d) ( "movq %%rsp, (%[save])\n\t" "movq %[stack], %%rsp\n\t" -#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4)) && !defined(__INTEL_COMPILER) +#if (__GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ >= 4) || __clang__) && \ + !defined(__INTEL_COMPILER) /* This emits a DWARF DW_CFA_undefined directive to make the return address undefined. This indicates that this is the top of the stack frame, and diff --git a/mysys/my_symlink2.c b/mysys/my_symlink2.c index defcb5962d8..c851468ce1b 100644 --- a/mysys/my_symlink2.c +++ b/mysys/my_symlink2.c @@ -170,22 +170,20 @@ int my_rename_with_symlink(const char *from, const char *to, myf MyFlags) in this case both the symlink and the symlinked file are deleted, but only if the symlinked file is not in the datadir. */ -int my_handler_delete_with_symlink(PSI_file_key key, const char *name, - const char *ext, myf sync_dir) +int my_handler_delete_with_symlink(const char *filename, myf sync_dir) { - char orig[FN_REFLEN], real[FN_REFLEN]; + char real[FN_REFLEN]; int res= 0; DBUG_ENTER("my_handler_delete_with_symlink"); - fn_format(orig, name, "", ext, MY_UNPACK_FILENAME | MY_APPEND_EXT); - if (my_is_symlink(orig)) + if (my_is_symlink(filename)) { /* Delete the symlinked file only if the symlink is not pointing into datadir. */ - if (!(my_realpath(real, orig, MYF(0)) || mysys_test_invalid_symlink(real))) - res= mysql_file_delete(key, real, MYF(MY_NOSYMLINKS | sync_dir)); + if (!(my_realpath(real, filename, MYF(0)) || mysys_test_invalid_symlink(real))) + res= my_delete(real, MYF(MY_NOSYMLINKS | sync_dir)); } - DBUG_RETURN(mysql_file_delete(key, orig, MYF(sync_dir)) || res); + DBUG_RETURN(my_delete(filename, MYF(sync_dir)) || res); } |