diff options
author | unknown <msvensson@neptunus.(none)> | 2006-06-07 12:05:42 +0200 |
---|---|---|
committer | unknown <msvensson@neptunus.(none)> | 2006-06-07 12:05:42 +0200 |
commit | 6ce84f2209261cac33e24b06f47766ba06ccba0c (patch) | |
tree | 938c149ca1ae61a9f95e995463c6d1817634b72f /mysys/my_copy.c | |
parent | 8e87d3be42194701757e670bb8da791cb5cdc225 (diff) | |
parent | 49cf54d1c99db5d3cfa65452c6b4bbb9aed87fc6 (diff) | |
download | mariadb-git-6ce84f2209261cac33e24b06f47766ba06ccba0c.tar.gz |
Merge neptunus.(none):/home/msvensson/mysql/my51-bug15936
into neptunus.(none):/home/msvensson/mysql/mysql-5.1-new-maint
include/config-win.h:
Auto merged
include/my_base.h:
Auto merged
mysys/my_clock.c:
Auto merged
mysys/my_copy.c:
Auto merged
mysys/my_create.c:
Auto merged
mysys/my_dup.c:
Auto merged
mysys/my_lib.c:
Auto merged
mysys/my_open.c:
Auto merged
mysys/my_redel.c:
Auto merged
sql/unireg.cc:
Auto merged
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 342b1cdc104..1bf024c524f 100644 --- a/mysys/my_copy.c +++ b/mysys/my_copy.c @@ -14,7 +14,6 @@ along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#define USES_TYPES /* sys/types is included */ #include "mysys_priv.h" #include <my_dir.h> /* for stat */ #include <m_string.h> |