diff options
| author | monty@narttu.mysql.fi <> | 2007-08-14 00:22:34 +0300 |
|---|---|---|
| committer | monty@narttu.mysql.fi <> | 2007-08-14 00:22:34 +0300 |
| commit | 9d609a59fdf6a13dd1fb615dca16957f359de62b (patch) | |
| tree | 2641806010f25bf6469538558e05487ecff3c959 /regex | |
| parent | 3ecef8c0b902b7ed213ba89ec3e8e5637033435e (diff) | |
| parent | e53a73e26cf858ac48ead40927d84d54e33c1695 (diff) | |
| download | mariadb-git-9d609a59fdf6a13dd1fb615dca16957f359de62b.tar.gz | |
Merge bk-internal.mysql.com:/home/bk/mysql-5.1
into mysql.com:/home/my/mysql-5.1
Diffstat (limited to 'regex')
| -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 |