diff options
| author | monty@tik.mysql.fi <> | 2002-02-13 22:37:19 +0200 |
|---|---|---|
| committer | monty@tik.mysql.fi <> | 2002-02-13 22:37:19 +0200 |
| commit | 2f3cfff0a2b4ed75ff3086440ba5a7bd6f4f75cb (patch) | |
| tree | f93a6d7f74bfe9a525304996a4bd5c965e755e8c /include | |
| parent | 4abd402b87def3f292f77b4091493675d9a37589 (diff) | |
| download | mariadb-git-2f3cfff0a2b4ed75ff3086440ba5a7bd6f4f75cb.tar.gz | |
Added --user=userid to mysqld
Fix for ctypes on windows
Cleanup max_queries_per_hour
Diffstat (limited to 'include')
| -rw-r--r-- | include/m_ctype.h | 26 |
1 files changed, 20 insertions, 6 deletions
diff --git a/include/m_ctype.h b/include/m_ctype.h index 05f49784802..61afcb7245e 100644 --- a/include/m_ctype.h +++ b/include/m_ctype.h @@ -62,9 +62,6 @@ extern const char *compiled_charset_name(uint charset_number); #define MY_CHARSET_UNDEFINED 0 #define MY_CHARSET_CURRENT (default_charset_info->number) -#ifdef __WIN__ -#include <ctype.h> -#endif /* Don't include std ctype.h when this is included */ #define _CTYPE_H #define _CTYPE_H_ @@ -72,6 +69,26 @@ extern const char *compiled_charset_name(uint charset_number); #define __CTYPE_INCLUDED #define _CTYPE_USING /* Don't put names in global namespace. */ +/* Fix things, if ctype.h would have been included before */ +#undef toupper +#undef _toupper +#undef _tolower +#undef toupper +#undef tolower +#undef isalpha +#undef isupper +#undef islower +#undef isdigit +#undef isxdigit +#undef isalnum +#undef isspace +#undef ispunct +#undef isprint +#undef isgraph +#undef iscntrl +#undef isascii +#undef toascii + #define _U 01 /* Upper case */ #define _L 02 /* Lower case */ #define _N 04 /* Numeral (digit) */ @@ -86,7 +103,6 @@ extern const char *compiled_charset_name(uint charset_number); #define my_to_lower (default_charset_info->to_lower) #define my_sort_order (default_charset_info->sort_order) -#ifndef __WIN__ #define _toupper(c) (char) my_to_upper[(uchar) (c)] #define _tolower(c) (char) my_to_lower[(uchar) (c)] #define toupper(c) (char) my_to_upper[(uchar) (c)] @@ -110,8 +126,6 @@ extern const char *compiled_charset_name(uint charset_number); #undef ctype #endif /* ctype */ -#endif /* __WIN__ */ - #define my_isalpha(s, c) (((s)->ctype+1)[(uchar) (c)] & (_U | _L)) #define my_isupper(s, c) (((s)->ctype+1)[(uchar) (c)] & _U) #define my_islower(s, c) (((s)->ctype+1)[(uchar) (c)] & _L) |