diff options
| author | unknown <msvensson@pilot.blaudden> | 2007-04-24 14:07:30 +0200 |
|---|---|---|
| committer | unknown <msvensson@pilot.blaudden> | 2007-04-24 14:07:30 +0200 |
| commit | d5ede428bc96034dac3e31048a763c0d1bdd0a6b (patch) | |
| tree | 1adee5081e56f21a474c3adc6199fbacdf40b9c3 /include/my_sys.h | |
| parent | 5018e6660f673ec2ec72ee30a489bfea0c79e405 (diff) | |
| parent | f692f710b759cc697176405aedd39bf094240269 (diff) | |
| download | mariadb-git-d5ede428bc96034dac3e31048a763c0d1bdd0a6b.tar.gz | |
Merge pilot.blaudden:/home/msvensson/mysql/mysql-5.0-maint
into pilot.blaudden:/home/msvensson/mysql/mysql-5.1-maint
include/m_ctype.h:
Auto merged
include/my_global.h:
Auto merged
include/my_sys.h:
Auto merged
include/Makefile.am:
Manual merge
Diffstat (limited to 'include/my_sys.h')
| -rw-r--r-- | include/my_sys.h | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/include/my_sys.h b/include/my_sys.h index cff8c73c9ff..15de73d65a0 100644 --- a/include/my_sys.h +++ b/include/my_sys.h @@ -31,10 +31,7 @@ extern int NEAR my_errno; /* Last error in mysys */ #include <my_pthread.h> #endif -#ifndef _m_ctype_h #include <m_ctype.h> /* for CHARSET_INFO */ -#endif - #include <stdarg.h> #include <typelib.h> |