Reapplied patch for bug18198

1 files changed, 17 insertions, 17 deletions

diff --git a/mysql-test/r/partition_range.result b/mysql-test/r/partition_range.result
index d39b39f413a..e9ebd5ba2cf 100644
--- a/mysql-test/r/partition_range.result
+++ b/mysql-test/r/partition_range.result
@@ -1,36 +1,36 @@
 drop table if exists t1;
 create table t1 (a varchar(10) charset latin1 collate latin1_bin, b int)
-partition by range (length(a) * b)
-(partition p0 values less than (2), partition p1 values less than (400));
+partition by range (ascii(a) * b)
+(partition p0 values less than (2), partition p1 values less than (4000));
 insert into t1 values ('a ', 2),('a',3);
 drop table t1;
 create table t1 (a varchar(10) charset latin1 collate latin1_bin, b int)
-partition by range (b* length(a) * b)
-(partition p0 values less than (2), partition p1 values less than (400));
+partition by range (b* ascii(a) * b)
+(partition p0 values less than (2), partition p1 values less than (4000));
 insert into t1 values ('a ', 2),('a',3);
 drop table t1;
 create table t1 (a varchar(10) charset latin1 collate latin1_bin,
 b varchar(10) charset latin1 collate latin1_bin)
-partition by range (length(b) * length(a))
-(partition p0 values less than (2), partition p1 values less than (400));
+partition by range (ascii(b) * ascii(a))
+(partition p0 values less than (2), partition p1 values less than (40000));
 insert into t1 values ('a ', 'b  '),('a','b');
 drop table t1;
 create table t1 (a varchar(10) charset latin1 collate latin1_bin,
 b varchar(10) charset latin1 collate latin1_bin)
-partition by range (length(a) * length(b))
-(partition p0 values less than (2), partition p1 values less than (400));
+partition by range (ascii(a) * ascii(b))
+(partition p0 values less than (2), partition p1 values less than (40000));
 insert into t1 values ('a ', 'b  '),('a','b');
 drop table t1;
 create table t1 (a varchar(10) charset latin1 collate latin1_bin,
 b varchar(10) charset latin1 collate latin1_bin, c int)
-partition by range (length(a) * c)
-(partition p0 values less than (2), partition p1 values less than (400));
+partition by range (ascii(a) * c)
+(partition p0 values less than (2), partition p1 values less than (4000));
 insert into t1 values ('a ', 'b  ', 2),('a','b', 3);
 drop table t1;
 create table t1 (a varchar(10) charset latin1 collate latin1_bin,
 b varchar(10) charset latin1 collate latin1_bin, c int)
-partition by range (c * length(a))
-(partition p0 values less than (2), partition p1 values less than (400));
+partition by range (c * ascii(a))
+(partition p0 values less than (2), partition p1 values less than (4000));
 insert into t1 values ('a ', 'b  ', 2),('a','b', 3);
 drop table t1;
 create table t1 (a int unsigned)
@@ -109,7 +109,7 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	pnull_pnullsp0,pnull_pnullsp1,p0_p0sp0,p0_p0sp1	ALL	NULL	NULL	NULL	NULL	4	Using where
 explain partitions select * from t1 where a > 1;
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p1_p1sp0,p1_p1sp1	ALL	NULL	NULL	NULL	NULL	2	Using where
+1	SIMPLE	NULL	NULL	NULL	NULL	NULL	NULL	NULL	NULL	Impossible WHERE noticed after reading const tables
 drop table t1;
 CREATE TABLE t1 (
 a int not null,
@@ -744,7 +744,7 @@ id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
 1	SIMPLE	t1	p407,p408,p409,p507,p508,p509	ALL	NULL	NULL	NULL	NULL	18	Using where
 DROP TABLE t1;
 create table t1 (a varchar(20))
-partition by range (crc32(md5(a)))
+partition by range (ascii(a))
 (partition p0 values less than (100),
 partition p1 values less than maxvalue);
 insert into t1 values ("12345678901234567890");
@@ -761,16 +761,16 @@ B2345678901234567890
 1234567890123456
 explain partitions select * from t1 where a = "12345678901234567890";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p1	ALL	NULL	NULL	NULL	NULL	5	Using where
+1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	5	Using where
 explain partitions select * from t1 where a = "12345678901234567890" OR
 a = "A2345678901234567890" OR
 a = "B2345678901234567890" OR
 a = "C2345678901234567890";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p1	ALL	NULL	NULL	NULL	NULL	5	Using where
+1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	5	Using where
 explain partitions select * from t1 where a = "01234567890123456";
 id	select_type	table	partitions	type	possible_keys	key	key_len	ref	rows	Extra
-1	SIMPLE	t1	p1	ALL	NULL	NULL	NULL	NULL	5	Using where
+1	SIMPLE	t1	p0	ALL	NULL	NULL	NULL	NULL	5	Using where
 select * from t1 where a = "01234567890123456";
 a
 select * from t1 where a = "12345678901234567890" OR