diff options
| author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-16 07:45:07 -0200 |
|---|---|---|
| committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-11-16 07:45:07 -0200 |
| commit | 0d0b3f8aca8afd10268b1305e94b87f17f07d3b2 (patch) | |
| tree | 8bb3c24e83c5645c346086318667a4d0cdb7b6a2 /regex | |
| parent | d6d16303cd5e2ba623f51a115f12954fe4a0ce2c (diff) | |
| parent | cd1c6e220de1730615c145b5337f7cce554dfdae (diff) | |
| download | mariadb-git-0d0b3f8aca8afd10268b1305e94b87f17f07d3b2.tar.gz | |
Merge of mysql-5.1-bugteam into mysql-5.5-bugteam.
Diffstat (limited to 'regex')
| -rw-r--r-- | regex/regexec.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/regex/regexec.c b/regex/regexec.c index 338c1bfa7fe..c0d03335b41 100644 --- a/regex/regexec.c +++ b/regex/regexec.c @@ -117,6 +117,7 @@ size_t nmatch; my_regmatch_t pmatch[]; int eflags; { + char *pstr = (char *) str; register struct re_guts *g = preg->re_g; #ifdef REDEBUG # define GOODFLAGS(f) (f) @@ -133,7 +134,7 @@ int eflags; if ((size_t) g->nstates <= CHAR_BIT*sizeof(states1) && !(eflags®_LARGE)) - return(smatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags)); + return(smatcher(preg->charset, g, pstr, nmatch, pmatch, eflags)); else - return(lmatcher(preg->charset, g, (char *)str, nmatch, pmatch, eflags)); + return(lmatcher(preg->charset, g, pstr, nmatch, pmatch, eflags)); } |