1
0
mirror of https://github.com/MariaDB/server.git synced 2025-08-08 11:22:35 +03:00

BUG#18198: More fixes

mysql-test/r/partition.result:
  Removed test case no longer supported
mysql-test/r/partition_error.result:
  Changed behaviour of test case
mysql-test/r/partition_pruning.result:
  Changed behaviour of test case
mysql-test/t/partition.test:
  Changed behaviour of test case
mysql-test/t/partition_error.test:
  Changed behaviour of test case
mysql-test/t/partition_pruning.test:
  Changed behaviour of test case
sql/sql_partition.cc:
  Ensured PARTITION BY KEY can use any column type
This commit is contained in:
unknown
2006-07-31 11:38:09 -04:00
parent 1e949e84c5
commit 04a70beb67
7 changed files with 28 additions and 30 deletions

View File

@@ -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));