bk commit into 4.1 tree (igor:1.2488) BUG#14896

[igor]

Below is the list of changes that have just been committed into a local
4.1 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.2488 06/06/12 21:07:48 igor@stripped +3 -0
  Fixed bug #14896.
  This bug in Field_string::cmp resulted in a wrong comparison 
  with keys in partial indexes over multi-byte character fields.
  Given field a is declared as 
    a varchar(16) collate utf8_unicode_ci
  INDEX(a(4)) gives us an example of such an index.
  
  Wrong key comparisons could lead to wrong result sets if 
  the selected query execution plan used a range scan by 
  a partial index over a utf8 character field.
  This also caused wrong results in many other cases.

  sql/field.cc
    1.230 06/06/12 21:07:44 igor@stripped +10 -11
    Fixed bug #14896.
    This bug in Field_string::cmp resulted in a wrong comparison 
    with keys in partial indexes over multi-byte character fields.
    Given field a is declared as 
      a varchar(16) collate utf8_unicode_ci
    INDEX(a(4)) gives us an example of such an index.
    
    Wrong key comparisons could lead to wrong result sets if 
    the selected query execution plan used a range scan by 
    a partial index over a utf8 character field.
    This also caused wrong results in many other cases.  
     

  mysql-test/t/ctype_utf8.test
    1.72 06/06/12 21:07:44 igor@stripped +26 -0
    Added test cases for bug #14896.

  mysql-test/r/ctype_utf8.result
    1.70 06/06/12 21:07:44 igor@stripped +40 -0
    Added test cases for bug #14896.

# 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-4.1-opt

--- 1.229/sql/field.cc	2006-03-28 05:32:37 -08:00
+++ 1.230/sql/field.cc	2006-06-12 21:07:44 -07:00
@@ -5072,17 +5072,6 @@
 {
   uint a_len, b_len;
 
-  if (field_charset->strxfrm_multiply > 1)
-  {
-    /*
-      We have to remove end space to be able to compare multi-byte-characters
-      like in latin_de 'ae' and 0xe4
-    */
-    return field_charset->coll->strnncollsp(field_charset,
-                                            (const uchar*) a_ptr, field_length,
-                                            (const uchar*) b_ptr,
-                                            field_length);
-  }
   if (field_charset->mbmaxlen != 1)
   {
     uint char_len= field_length/field_charset->mbmaxlen;
@@ -5091,6 +5080,16 @@
   }
   else
     a_len= b_len= field_length;
+  if (field_charset->strxfrm_multiply > 1)
+  {
+    /*
+      We have to remove end space to be able to compare multi-byte-characters
+      like in latin_de 'ae' and 0xe4
+    */
+    return field_charset->coll->strnncollsp(field_charset,
+                                            (const uchar*) a_ptr, a_len,
+                                            (const uchar*) b_ptr, b_len);
+  }
   return my_strnncoll(field_charset,(const uchar*) a_ptr, a_len,
                                     (const uchar*) b_ptr, b_len);
 }

--- 1.69/mysql-test/r/ctype_utf8.result	2006-03-29 14:50:50 -08:00
+++ 1.70/mysql-test/r/ctype_utf8.result	2006-06-12 21:07:44 -07:00
@@ -1124,3 +1124,43 @@
 Table	Op	Msg_type	Msg_text
 test.t1	check	status	OK
 drop table t1;
+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;
+id	a	b
+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 WHERE a BETWEEN 'aaaa' AND 'bbbbbb';
+id	a	b
+8	aaaa	10
+9	aaaa	50
+6	bbbbbb	40
+11	bbbbbb	60
+SELECT id, a FROM t1 WHERE a='bbbbbb';
+id	a
+6	bbbbbb
+11	bbbbbb
+SELECT id, a FROM t1 WHERE a='bbbbbb' ORDER BY b;
+id	a
+6	bbbbbb
+11	bbbbbb
+DROP TABLE t1;

--- 1.71/mysql-test/t/ctype_utf8.test	2006-03-29 14:50:50 -08:00
+++ 1.72/mysql-test/t/ctype_utf8.test	2006-06-12 21:07:44 -07:00
@@ -926,4 +926,30 @@
 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