From 46b2fab4d2e257e51506e7d7f89f08ee63146cb2 Mon Sep 17 00:00:00 2001
From: Mattias Jonsson <mattias.jonsson@sun.com>
Date: Tue, 17 Nov 2009 22:47:34 +0100
Subject: [PATCH] backport of bug#45904 from mysql-pe to 5.1

---
 mysql-test/r/partition.result |  7 +++++++
 mysql-test/t/partition.test   | 11 +++++++++++
 sql/sql_partition.cc          |  2 +-
 3 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/mysql-test/r/partition.result b/mysql-test/r/partition.result
index 6611d39628f..425f1e85d00 100644
--- a/mysql-test/r/partition.result
+++ b/mysql-test/r/partition.result
@@ -50,6 +50,13 @@ t1	CREATE TABLE `t1` (
  PARTITION p3 VALUES LESS THAN (733969) ENGINE = MyISAM,
  PARTITION pmax VALUES LESS THAN MAXVALUE ENGINE = MyISAM) */
 DROP TABLE t1;
+create table t1 (a int NOT NULL, b varchar(5) NOT NULL)
+default charset=utf8
+partition by list (a)
+subpartition by key (b)
+(partition p0 values in (1),
+partition p1 values in (2));
+drop table t1;
 create table t1 (a int, b int, key(a))
 partition by list (a)
 ( partition p0 values in (1),
diff --git a/mysql-test/t/partition.test b/mysql-test/t/partition.test
index 1dfc53c6232..1d77128d33b 100644
--- a/mysql-test/t/partition.test
+++ b/mysql-test/t/partition.test
@@ -61,6 +61,17 @@ SELECT * FROM t1;
 SHOW CREATE TABLE t1;
 DROP TABLE t1;
 
+#
+# Bug#45904: Error when CHARSET=utf8 and subpartitioning
+#
+create table t1 (a int NOT NULL, b varchar(5) NOT NULL)
+default charset=utf8
+partition by list (a)
+subpartition by key (b)
+(partition p0 values in (1),
+ partition p1 values in (2));
+drop table t1;
+
 #
 # Bug#44059: rec_per_key on empty partition gives weird optimiser results
 #
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc
index 04d22174c8e..d07c07f11c7 100644
--- a/sql/sql_partition.cc
+++ b/sql/sql_partition.cc
@@ -1679,7 +1679,7 @@ bool fix_partition_func(THD *thd, TABLE *table,
   if (((part_info->part_type != HASH_PARTITION ||
       part_info->list_of_part_fields == FALSE) &&
       check_part_func_fields(part_info->part_field_array, TRUE)) ||
-      (part_info->list_of_part_fields == FALSE &&
+      (part_info->list_of_subpart_fields == FALSE &&
        part_info->is_sub_partitioned() &&
        check_part_func_fields(part_info->subpart_field_array, TRUE)))
   {