bzr commit into mysql-5.5-next-mr-bugfixing branch (mattias.jonsson:2941)

[Mattias Jonsson]

#At file:///Users/mattiasj/clones/bzrroot/topush-m-n-mr-bf/ based on revid:alik@stripped

 2941 Mattias Jonsson	2009-12-21 [merge]
      merge

    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


Attachment: [text/bzr-bundle]