bk commit into 5.0 tree (igor:1.2167)

[igor]

Below is the list of changes that have just been committed into a local
5.0 repository of igor. When igor 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.2167 06/06/12 23:09:15 igor@stripped +2 -0
  Merge rurik.mysql.com:/home/igor/mysql-4.1-opt
  into  rurik.mysql.com:/home/igor/mysql-5.0-opt

  sql/opt_sum.cc
    1.53 06/06/12 23:05:18 igor@stripped +0 -0
    Auto merged

  mysql-test/t/ctype_utf8.test
    1.80 06/06/12 23:05:18 igor@stripped +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:	igor
# Host:	rurik.mysql.com
# Root:	/home/igor/mysql-5.0-opt/RESYNC

--- 1.52/sql/opt_sum.cc	2006-06-02 16:55:50 -07:00
+++ 1.53/sql/opt_sum.cc	2006-06-12 23:05:18 -07:00
@@ -569,10 +569,6 @@
       break;                        // Found a part od the key for the field
   }
 
-#if 0
-  if (part->length != (((Item_field*) args[0])->field)->field_length)
-    return 0;
-#endif
   bool is_field_part= part == field_part;
   if (!(is_field_part || eq_type))
     return 0;

--- 1.79/mysql-test/t/ctype_utf8.test	2006-03-30 04:58:06 -08:00
+++ 1.80/mysql-test/t/ctype_utf8.test	2006-06-12 23:05:18 -07:00
@@ -912,6 +912,32 @@
 check table t1;
 drop table t1;
 
+#
+# Bug#14896: Comparison with a key in a partial index over mb chararacter field
+#
+
+SET NAMES utf8;
+CREATE TABLE t1 (id int PRIMARY KEY,
+                 a varchar(16) collate utf8_unicode_ci NOT NULL default '',
+                 b int,
+                 f varchar(128) default 'XXX',
+                 INDEX (a(4))
+) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci;
+INSERT INTO t1(id, a, b) VALUES
+  (1, 'cccc', 50), (2, 'cccc', 70), (3, 'cccc', 30),
+  (4, 'cccc', 30), (5, 'cccc', 20), (6, 'bbbbbb', 40),
+  (7, 'dddd', 30), (8, 'aaaa', 10), (9, 'aaaa', 50),
+  (10, 'eeeee', 40), (11, 'bbbbbb', 60);
+
+SELECT id, a, b FROM t1;
+
+SELECT id, a, b FROM t1 WHERE a BETWEEN 'aaaa' AND 'bbbbbb';
+
+SELECT id, a FROM t1 WHERE a='bbbbbb';
+SELECT id, a FROM t1 WHERE a='bbbbbb' ORDER BY b;
+
+DROP TABLE t1;
+
 # End of 4.1 tests
 
 #