diff options
| author | unknown <monty@narttu.mysql.fi> | 2007-08-14 15:22:44 +0300 |
|---|---|---|
| committer | unknown <monty@narttu.mysql.fi> | 2007-08-14 15:22:44 +0300 |
| commit | 9d779efebca4c17d355f035f7b1f67ba31bb72f5 (patch) | |
| tree | 9812a9a0314e383c93e3453fc4525170728a79bc /regex/regcomp.c | |
| parent | 6c9e77ae3ad48ededd3e51728fd7182ae0e99350 (diff) | |
| parent | 3593bb4f50c4be593bb1b851d9637893c4bb0dc0 (diff) | |
| download | mariadb-git-9d779efebca4c17d355f035f7b1f67ba31bb72f5.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1-marvel
into mysql.com:/home/my/mysql-5.1
sql/log_event.cc:
manual merge
Diffstat (limited to 'regex/regcomp.c')
| -rw-r--r-- | regex/regcomp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/regex/regcomp.c b/regex/regcomp.c index 9cba56a97dd..398e132d97d 100644 --- a/regex/regcomp.c +++ b/regex/regcomp.c @@ -1479,8 +1479,8 @@ sopno pos; } { int length=(HERE()-pos-1)*sizeof(sop); - bmove_upp((char *) &p->strip[pos+1]+length, - (char *) &p->strip[pos]+length, + bmove_upp((uchar *) &p->strip[pos+1]+length, + (uchar *) &p->strip[pos]+length, length); } #ifdef OLD_CODE |