summaryrefslogtreecommitdiff
path: root/myisam
diff options
context:
space:
mode:
authorsvoj@april.(none) <>2006-01-23 17:15:33 +0400
committersvoj@april.(none) <>2006-01-23 17:15:33 +0400
commit4dc4502ab3528718c6a7ffb0fd11da224bb700bd (patch)
tree7013861d559c88de296287529f44f879fce85354 /myisam
parent02ce3d0cad5ef5cc6e77a1fdf628bf825b5f9157 (diff)
downloadmariadb-git-4dc4502ab3528718c6a7ffb0fd11da224bb700bd.tar.gz
BUG#16489 - utf8 + fulltext leads to corrupt index file.
Fixed that UPDATE statement crashes multi-byte charset fulltext index.
Diffstat (limited to 'myisam')
-rw-r--r--myisam/ft_update.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/myisam/ft_update.c b/myisam/ft_update.c
index beccc062270..8f2b2bce101 100644
--- a/myisam/ft_update.c
+++ b/myisam/ft_update.c
@@ -170,6 +170,10 @@ int _mi_ft_cmp(MI_INFO *info, uint keynr, const byte *rec1, const byte *rec2)
FT_SEG_ITERATOR ftsi1, ftsi2;
CHARSET_INFO *cs=info->s->keyinfo[keynr].seg->charset;
DBUG_ENTER("_mi_ft_cmp");
+#ifndef MYSQL_HAS_TRUE_CTYPE_IMPLEMENTATION
+ if (cs->mbmaxlen > 1)
+ DBUG_RETURN(THOSE_TWO_DAMN_KEYS_ARE_REALLY_DIFFERENT);
+#endif
_mi_ft_segiterator_init(info, keynr, rec1, &ftsi1);
_mi_ft_segiterator_init(info, keynr, rec2, &ftsi2);