Reapplied patch for bug18198

1 files changed, 13 insertions, 13 deletions

diff --git a/mysql-test/t/partition_range.test b/mysql-test/t/partition_range.test
index 84f67febe8b..219637d6f81 100644
--- a/mysql-test/t/partition_range.test
+++ b/mysql-test/t/partition_range.test
@@ -13,42 +13,42 @@ drop table if exists t1;
 # BUG 18198: Various tests for partition functions
 #
 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;
 
@@ -734,7 +734,7 @@ DROP TABLE t1;
 # Bug 18198: Try with a couple of cases using VARCHAR fields in
 #            partition function.
 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);