merging

sql/sql_partition.cc:
  Auto merged

1 files changed, 6 insertions, 0 deletions

diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index 4ef61745cda..df15a5652e0 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -557,6 +557,12 @@ t2	CREATE TABLE `t2` (
   PRIMARY KEY (`a`)
 ) ENGINE=MyISAM DEFAULT CHARSET=latin1 COMMENT='no comment' PARTITION BY KEY (a) 
 drop table t2;
+create table t1 (s1 char(2) character set utf8)
+partition by list (case when s1 > 'cz' then 1 else 2 end)
+(partition p1 values in (1),
+partition p2 values in (2));
+drop table t1;
+create table t1 (f1 int) partition by hash (f1) as select 1;
 prepare stmt1 from 'create table t1 (s1 int) partition by hash (s1)';
 execute stmt1;
 execute stmt1;