diff options
| author | unknown <kent@mysql.com> | 2005-09-29 03:20:31 +0200 |
|---|---|---|
| committer | unknown <kent@mysql.com> | 2005-09-29 03:20:31 +0200 |
| commit | 14650d4f66f9369eedba534a8434fe82c217e66d (patch) | |
| tree | 38ed48baf66a457188a181eeff05f39f32789b9b /regex/engine.c | |
| parent | f75271a53e2895c45c555f786982ad5120aed96b (diff) | |
| parent | 72340d672d573d21871b385b8ca5edd29e839a9b (diff) | |
| download | mariadb-git-14650d4f66f9369eedba534a8434fe82c217e66d.tar.gz | |
Merge
client/mysqltest.c:
Auto merged
mysql-test/lib/mtr_process.pl:
Auto merged
os2/MySQL-Source.icc:
Auto merged
regex/Makefile.am:
Auto merged
regex/engine.c:
Auto merged
regex/main.c:
Auto merged
regex/regerror.c:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/mysqld.cc:
Auto merged
Diffstat (limited to 'regex/engine.c')
| -rw-r--r-- | regex/engine.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/regex/engine.c b/regex/engine.c index c4c4efe7e2f..1968ca61a96 100644 --- a/regex/engine.c +++ b/regex/engine.c @@ -32,7 +32,7 @@ struct match { struct re_guts *g; int eflags; - regmatch_t *pmatch; /* [nsub+1] (0 element unused) */ + my_regmatch_t *pmatch; /* [nsub+1] (0 element unused) */ char *offp; /* offsets work from here */ char *beginp; /* start of string -- virtual NUL precedes */ char *endp; /* end of string -- virtual NUL here */ @@ -68,7 +68,7 @@ CHARSET_INFO *charset; register struct re_guts *g; char *str; size_t nmatch; -regmatch_t pmatch[]; +my_regmatch_t pmatch[]; int eflags; { register char *endp; @@ -148,8 +148,8 @@ int eflags; /* oh my, he wants the subexpressions... */ if (m->pmatch == NULL) - m->pmatch = (regmatch_t *)malloc((m->g->nsub + 1) * - sizeof(regmatch_t)); + m->pmatch = (my_regmatch_t *)malloc((m->g->nsub + 1) * + sizeof(my_regmatch_t)); if (m->pmatch == NULL) { if (m->lastpos != NULL) free((char *)m->lastpos); |