bk commit into 5.0 tree (svoj:1.2001)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2001 06/01/23 20:07:26 svoj@april.(none) +2 -0
  Merge april.(none):/home/svoj/devel/mysql/BUG16489/mysql-4.1
  into  april.(none):/home/svoj/devel/mysql/BUG16489/mysql-5.0

  mysql-test/r/fulltext2.result
    1.12 06/01/23 20:07:22 svoj@april.(none) +0 -0
    Auto merged

  mysql-test/r/fulltext2.result
    1.9.2.2 06/01/23 20:07:22 svoj@april.(none) +0 -0
    Change mode to -rw-rw-r--

  myisam/ft_update.c
    1.38 06/01/23 20:06:00 svoj@april.(none) +0 -0
    Auto merged

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG16489/mysql-5.0/RESYNC

--- 1.37/myisam/ft_update.c	2004-12-18 07:19:14 +04:00
+++ 1.38/myisam/ft_update.c	2006-01-23 20:06:00 +04:00
@@ -168,6 +168,10 @@
   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);