diff options
| author | mikael/pappa@dator5.(none) <> | 2006-07-31 11:38:09 -0400 |
|---|---|---|
| committer | mikael/pappa@dator5.(none) <> | 2006-07-31 11:38:09 -0400 |
| commit | 23cb067aa2b8404b94013339990a7d639c7ea8a5 (patch) | |
| tree | de0a7f36023a582a363eb28f116213550082b456 /sql/sql_partition.cc | |
| parent | d870e355085742a7f009a6f4f88f7f4903428de6 (diff) | |
| download | mariadb-git-23cb067aa2b8404b94013339990a7d639c7ea8a5.tar.gz | |
BUG#18198: More fixes
Diffstat (limited to 'sql/sql_partition.cc')
| -rw-r--r-- | sql/sql_partition.cc | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/sql/sql_partition.cc b/sql/sql_partition.cc index 55eab215746..54610328694 100644 --- a/sql/sql_partition.cc +++ b/sql/sql_partition.cc @@ -1553,8 +1553,11 @@ bool fix_partition_func(THD *thd, TABLE *table, goto end; } } - if ((check_part_func_fields(part_info->part_field_array)) || - (part_info->is_sub_partitioned() && + if (((part_info->part_type != HASH_PARTITION || + part_info->list_of_part_fields == FALSE) && + check_part_func_fields(part_info->part_field_array)) || + (part_info->list_of_part_fields == FALSE && + part_info->is_sub_partitioned() && check_part_func_fields(part_info->subpart_field_array))) { my_error(ER_PARTITION_FUNCTION_IS_NOT_ALLOWED, MYF(0)); |