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/regexec.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'regex/regexec.c') diff --git a/regex/regexec.c b/regex/regexec.c index 7f2704f8214..723289bd0ad 100644 --- a/regex/regexec.c +++ b/regex/regexec.c @@ -133,7 +133,7 @@ int eflags; if ((size_t) g->nstates <= CHAR_BIT*sizeof(states1) && !(eflags®_LARGE)) - return(smatcher(g, (char *)str, nmatch, pmatch, eflags)); + return(smatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags)); else - return(lmatcher(g, (char *)str, nmatch, pmatch, eflags)); + return(lmatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags)); } -- cgit v1.2.1