From 654db69b8247a7e6be4e039a558f635af9abae57 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 6 Mar 2002 20:04:13 +0400 Subject: Regex library is switched to use new ctype tools to allow usage of many character sets at a time. include/m_ctype.h: Added condition to simplify migrating from old ctype Added new style toupper, tolower which accepts charset in first argument regex/debug.c: Added charset argument regex/debug.ih: added charset argument regex/engine.c: added charset argument regex/engine.ih: added charset arguent regex/main.c: added charset argument regex/regcomp.c: added CHARSET_INFO field regex/regcomp.ih: Added charset argument regex/regex.h: Added #include for CHARSET_INFO Added charset argument for regcomp() regex/regex2.h: New charset argument for ISWORD() regex/regexec.c: New charset argument regex/reginit.c: Move to new style ctype. However still needs fixes: instead of single static cclass variable, each charset must have it's own variable. sql/item_cmpfunc.cc: Pass charset field into regcomp() This will be fixed tommorow to use String->charset instead of default_charset_info --- regex/regex2.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'regex/regex2.h') diff --git a/regex/regex2.h b/regex/regex2.h index 0d94baa310f..bba54ea2054 100644 --- a/regex/regex2.h +++ b/regex/regex2.h @@ -140,6 +140,6 @@ struct re_guts { /* misc utilities */ #undef OUT /* May be defined in windows */ #define OUT (CHAR_MAX+1) /* a non-character value */ -#define ISWORD(c) (isalnum(c) || (c) == '_') +#define ISWORD(s,c) (my_isalnum(s,c) || (c) == '_') #endif /* __regex2_h__ */ -- cgit v1.2.1