From: Mattias Jonsson
Date: December 21 2009 10:30am
Subject: bzr commit into mysql-5.5-trunk-bugfixing branch
 (mattias.jonsson:2926) Bug#48737
List-Archive: http://lists.mysql.com/commits/95195
X-Bug: 48737
Message-Id: <20091221103057.DA6F62BB94ED@client-10-129-10-236.upp.off.mysql.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="Boundary_(ID_Vf8dtLRWBXZn9G8YuDMwpQ)"

--Boundary_(ID_Vf8dtLRWBXZn9G8YuDMwpQ)
MIME-version: 1.0
Content-type: text/plain; CHARSET=US-ASCII
Content-transfer-encoding: 7BIT
Content-disposition: inline

#At file:///Users/mattiasj/clones/bzrroot/topush-mysql-trunk-bugfixing/ based on revid:alik@stripped

 2926 Mattias Jonsson	2009-12-21
      Bug#48737: Partitions: search fails with ucs2
      
      Recommit of patch:
      http://lists.mysql.com/commits/91400
      
      Test case only (code part was pushes as bug-49028)
     @ mysql-test/r/partition_column.result
        Bug#48737: Partitions: search fails with ucs2
        
        added test case
     @ mysql-test/t/partition_column.test
        Bug#48737: Partitions: search fails with ucs2
        
        Added result

    modified:
      mysql-test/r/partition_column.result
      mysql-test/t/partition_column.test
=== modified file 'mysql-test/r/partition_column.result'
--- a/mysql-test/r/partition_column.result	2009-12-17 17:39:10 +0000
+++ b/mysql-test/r/partition_column.result	2009-12-21 10:30:49 +0000
@@ -9,6 +9,30 @@ partition by range columns (a,b,c)
 ( partition p0 values less than (1, maxvalue, 10),
 partition p1 values less than (1, maxvalue, maxvalue));
 ERROR HY000: VALUES LESS THAN value must be strictly increasing for each partition
+create table t1 (a varchar(5) character set ucs2 collate ucs2_bin)
+partition by range columns (a)
+(partition p0 values less than (0x0041));
+insert into t1 values (0x00410000);
+select hex(a) from t1 where a like 'A_';
+hex(a)
+00410000
+explain partitions select hex(a) from t1 where a like 'A_';
+id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
+1	SIMPLE	t1	p0	system	NULL	NULL	NULL	NULL	1	
+alter table t1 remove partitioning;
+select hex(a) from t1 where a like 'A_';
+hex(a)
+00410000
+create index a on t1 (a);
+select hex(a) from t1 where a like 'A_';
+hex(a)
+00410000
+insert into t1 values ('A_');
+select hex(a) from t1;
+hex(a)
+00410000
+0041005F
+drop table t1;
 create table t1 (a varchar(1) character set latin1 collate latin1_general_ci)
 partition by range columns(a)
 ( partition p0 values less than ('a'),

=== modified file 'mysql-test/t/partition_column.test'
--- a/mysql-test/t/partition_column.test	2009-12-02 07:14:22 +0000
+++ b/mysql-test/t/partition_column.test	2009-12-21 10:30:49 +0000
@@ -24,6 +24,23 @@ partition by range columns (a,b,c)
   partition p1 values less than (1, maxvalue, maxvalue));
 
 #
+# BUG#48737, Search fails with ucs2
+#
+create table t1 (a varchar(5) character set ucs2 collate ucs2_bin)
+partition by range columns (a)
+(partition p0 values less than (0x0041));
+insert into t1 values (0x00410000);
+select hex(a) from t1 where a like 'A_';
+explain partitions select hex(a) from t1 where a like 'A_';
+alter table t1 remove partitioning;
+select hex(a) from t1 where a like 'A_';
+create index a on t1 (a);
+select hex(a) from t1 where a like 'A_';
+insert into t1 values ('A_');
+select hex(a) from t1;
+drop table t1;
+
+#
 # BUG#48161, Delivering too few records using collate syntax with partitions
 #
 # Test case from BUG#48447 with some extension


--Boundary_(ID_Vf8dtLRWBXZn9G8YuDMwpQ)
MIME-version: 1.0
Content-type: text/bzr-bundle; CHARSET=US-ASCII;
 name*0="bzr/mattias.jonsson@stripped";
 name*1=49-4mzzi788533d294v.bundle
Content-transfer-encoding: 7BIT
Content-disposition: inline;
 filename*0="bzr/mattias.jonsson@stripped";
 filename*1=49-4mzzi788533d294v.bundle

# Bazaar merge directive format 2 (Bazaar 0.90)
# revision_id: mattias.jonsson@stripped
# target_branch: file:///Users/mattiasj/clones/bzrroot/topush-mysql-\
#   trunk-bugfixing/
# testament_sha1: 414306ff517b4c5de39fac1eeb6058eff3a24835
# timestamp: 2009-12-21 11:30:56 +0100
# source_branch: file:///Users/mattiasj/clones/bzrroot/b49369-m-t-bt/
# base_revision_id: alik@stripped
# 
# Begin bundle
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


--Boundary_(ID_Vf8dtLRWBXZn9G8YuDMwpQ)--