diff options
author | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-04-29 16:50:58 -0400 |
---|---|---|
committer | Nirbhay Choubey <nirbhay@mariadb.com> | 2016-04-29 16:50:58 -0400 |
commit | 8a1efa1bdd29b756c93a3ddbd8ad6fadec1082bc (patch) | |
tree | 9827e75d29817f3ddbc2008ba2b5b21553c14c5e /mysys/my_copy.c | |
parent | 7c42b47e67918104fddd121a1ca9fede28ed47cf (diff) | |
parent | 9eba34f08675c31b0796eeb127582be827773070 (diff) | |
download | mariadb-git-8a1efa1bdd29b756c93a3ddbd8ad6fadec1082bc.tar.gz |
Merge branch '10.0' into 10.0-galera
Diffstat (limited to 'mysys/my_copy.c')
-rw-r--r-- | mysys/my_copy.c | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/mysys/my_copy.c b/mysys/my_copy.c index 8af572b5518..bd23dfc48cd 100644 --- a/mysys/my_copy.c +++ b/mysys/my_copy.c @@ -18,7 +18,6 @@ #include "mysys_err.h" #include <my_dir.h> /* for stat */ #include <m_string.h> -#include "mysys_err.h" #if defined(HAVE_UTIME_H) #include <utime.h> #elif defined(HAVE_SYS_UTIME_H) |