bzr commit into mysql-5.5-trunk branch (mikael:2923) Bug#48737 Bug#49028

[Mikael Ronstrom]

#At file:///home/mikael/mysql_clones/mysql-trunk-bug48737/ based on revid:mikael@stripped7qs619dg

 2923 Mikael Ronstrom	2009-11-24
      BUG#49028, Added test case, fixed by patch for BUG#48737

    modified:
      mysql-test/r/ctype_ucs.result
      mysql-test/t/ctype_ucs.test
=== modified file 'mysql-test/r/ctype_ucs.result'
--- a/mysql-test/r/ctype_ucs.result	2008-12-23 14:21:01 +0000
+++ b/mysql-test/r/ctype_ucs.result	2009-11-24 11:35:49 +0000
@@ -116,6 +116,26 @@ select binary 'a  a' > 'a', binary 'a  \
 binary 'a  a' > 'a'	binary 'a  \0' > 'a'	binary 'a\0' > 'a'
 1	1	1
 SET CHARACTER SET koi8r;
+create table t1 (a varchar(2) character set ucs2 collate ucs2_bin, key(a));
+insert into t1 values ('A'),('A'),('B'),('C'),('D'),('A\t');
+insert into t1 values ('A\0'),('A\0'),('A\0'),('A\0'),('AZ');
+select hex(a) from t1 where a like 'A_' order by a;
+hex(a)
+00410000
+00410000
+00410000
+00410000
+00410009
+0041005A
+select hex(a) from t1 ignore key(a) where a like 'A_' order by a;
+hex(a)
+00410000
+00410000
+00410000
+00410000
+00410009
+0041005A
+drop table t1;
 CREATE TABLE t1 (word VARCHAR(64) CHARACTER SET ucs2, word2 CHAR(64) CHARACTER SET ucs2);
 INSERT INTO t1 VALUES (_koi8r'�koi8r'� (X'2004',X'2004');
 SELECT hex(word) FROM t1 ORDER BY word;

=== modified file 'mysql-test/t/ctype_ucs.test'
--- a/mysql-test/t/ctype_ucs.test	2008-12-23 14:21:01 +0000
+++ b/mysql-test/t/ctype_ucs.test	2009-11-24 11:35:49 +0000
@@ -15,6 +15,16 @@ SET character_set_connection=ucs2;
 SET CHARACTER SET koi8r;
 
 #
+# BUG#49028, error in LIKE with ucs2
+#
+create table t1 (a varchar(2) character set ucs2 collate ucs2_bin, key(a));
+insert into t1 values ('A'),('A'),('B'),('C'),('D'),('A\t');
+insert into t1 values ('A\0'),('A\0'),('A\0'),('A\0'),('AZ');
+select hex(a) from t1 where a like 'A_' order by a;
+select hex(a) from t1 ignore key(a) where a like 'A_' order by a;
+drop table t1;
+
+#
 # Check that 0x20 is only trimmed when it is 
 # a part of real SPACE character, not just a part
 # of a multibyte sequence.

Attachment: [text/bzr-bundle] bzr/[e-mail]