diff options
| author | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-11-17 22:51:49 +0100 |
|---|---|---|
| committer | Mattias Jonsson <mattias.jonsson@sun.com> | 2009-11-17 22:51:49 +0100 |
| commit | 3faaf333334ad5b16e65003b66d574db663c7148 (patch) | |
| tree | 780ca40436b3eca36d8c012994efa0d2a682b2d6 /sql/sql_partition.cc | |
| parent | 7a6ab645ab02d5cb19288f1b3b5fcd271732bb4a (diff) | |
| parent | 98fd304278ca029b56671412e8bec72ed4f17537 (diff) | |
| download | mariadb-git-3faaf333334ad5b16e65003b66d574db663c7148.tar.gz | |
merge
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 42e19872b5d..0decd3e1a91 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1692,7 +1692,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))) { |