summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorunknown <serg@serg.mylan>2004-12-07 21:43:12 +0100
committerunknown <serg@serg.mylan>2004-12-07 21:43:12 +0100
commitf8c1d3fae46e2c6f4555b6ae861a3fb1a08932c0 (patch)
treed4a3e8b816644c1381469e57d6f44d1f4803e65f /myisam
parentf3ab62a1825b2a37443dc7a944f96dda910a1a97 (diff)
parent27c6192e82bffc5f340d548b987eac17fdb86494 (diff)
downloadmariadb-git-f8c1d3fae46e2c6f4555b6ae861a3fb1a08932c0.tar.gz
Merge bk-internal.mysql.com:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'myisam')
-rw-r--r--myisam/ft_boolean_search.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/myisam/ft_boolean_search.c b/myisam/ft_boolean_search.c
index c432ac5a16c..ffc7e1bf104 100644
--- a/myisam/ft_boolean_search.c
+++ b/myisam/ft_boolean_search.c
@@ -155,7 +155,7 @@ static void _ftb_parse_query(FTB *ftb, byte **start, byte *end,
ftbw=(FTB_WORD *)alloc_root(&ftb->mem_root,
sizeof(FTB_WORD) +
(param.trunc ? MI_MAX_KEY_BUFF :
- w.len+extra));
+ w.len*ftb->charset->mbmaxlen+extra));
ftbw->len=w.len+1;
ftbw->flags=0;
ftbw->off=0;