diff options
| author | unknown <svoj@april.(none)> | 2006-01-23 20:07:26 +0400 |
|---|---|---|
| committer | unknown <svoj@april.(none)> | 2006-01-23 20:07:26 +0400 |
| commit | dde3f7275ba4ed065f82e74be6d3f99bc671c176 (patch) | |
| tree | 164568c772c9b83119a7b2ab7a09ba1172bd2a74 /myisam/ft_update.c | |
| parent | 2bdcc1714e2c84e5d4dcd21ad27c459d3a7b79b6 (diff) | |
| parent | 0ee28e1a4daca25f85ced473b2014e868ae341f8 (diff) | |
| download | mariadb-git-dde3f7275ba4ed065f82e74be6d3f99bc671c176.tar.gz | |
Merge april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1
into april.(none):/home/svoj/devel/mysql/BUG16489/mysql-5.0
myisam/ft_update.c:
Auto merged
mysql-test/r/fulltext2.result:
Auto merged
Diffstat (limited to 'myisam/ft_update.c')
| -rw-r--r-- | myisam/ft_update.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/myisam/ft_update.c b/myisam/ft_update.c index b8cd925bf4f..7fa86094144 100644 --- a/myisam/ft_update.c +++ b/myisam/ft_update.c @@ -168,6 +168,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); |