diff options
| author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-09-19 12:12:33 -0400 |
|---|---|---|
| committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-09-19 12:12:33 -0400 |
| commit | 81c13acfb3585baf435eb37955561053f02e12bb (patch) | |
| tree | 74d838b5d1011187705f4801db033118fd41537c /mysys | |
| parent | d40d3f4e57f375897aa29e72e947e372e6bc229d (diff) | |
| parent | 0da39caceea7733a94d898427d63ba2670160af4 (diff) | |
| download | mariadb-git-81c13acfb3585baf435eb37955561053f02e12bb.tar.gz | |
Merge tag 'mariadb-5.5.52' into 5.5-galeramariadb-galera-5.5.52
Diffstat (limited to 'mysys')
| -rw-r--r-- | mysys/my_redel.c | 7 | ||||
| -rw-r--r-- | mysys/my_static.c | 1 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mysys/my_redel.c b/mysys/my_redel.c index b285bb25e2e..e5e4f48d9d5 100644 --- a/mysys/my_redel.c +++ b/mysys/my_redel.c @@ -1,5 +1,5 @@ -/* - Copyright (c) 2000, 2010, Oracle and/or its affiliates +/* Copyright (c) 2000, 2010, Oracle and/or its affiliates + Copyright (c) 2009, 2016, MariaDB This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -49,7 +49,8 @@ int my_redel(const char *org_name, const char *tmp_name, DBUG_PRINT("my",("org_name: '%s' tmp_name: '%s' MyFlags: %d", org_name,tmp_name,MyFlags)); - if (my_copystat(org_name,tmp_name,MyFlags) < 0) + if (!my_disable_copystat_in_redel && + my_copystat(org_name,tmp_name,MyFlags) < 0) goto end; if (MyFlags & MY_REDEL_MAKE_BACKUP) { diff --git a/mysys/my_static.c b/mysys/my_static.c index fdc01b1248b..48b1e5b8dd9 100644 --- a/mysys/my_static.c +++ b/mysys/my_static.c @@ -99,6 +99,7 @@ my_bool my_disable_sync=0; my_bool my_disable_async_io=0; my_bool my_disable_flush_key_blocks=0; my_bool my_disable_symlinks=0; +my_bool my_disable_copystat_in_redel=0; /* Note that PSI_hook and PSI_server are unconditionally |