1berry/MariaDB-server
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BUG#18198

Browse Source 
Fixed interface to check_partition_func_processor


sql/partition_info.cc:
  Fixed interface to check_partition_func_processor
This commit is contained in:
unknown 2006-09-26 02:30:40 -04:00
parent 35f1ee0328
commit fad4962a5b
1 changed files with 7 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sql/partition_info.cc
View File

@ -722,25 +722,17 @@ bool partition_info::check_partition_info(THD *thd, handlerton **eng_type,
if (check_partition_function) if (check_partition_function)
{ {
int part_expression_ok= 1; int err= 0;
int pf_collation_allowed= 1;
int spf_collation_allowed= 1;
if (part_type != HASH_PARTITION || !list_of_part_fields) if (part_type != HASH_PARTITION || !list_of_part_fields)
{ {
part_expr->walk(&Item::check_partition_func_processor, 0, err= part_expr->walk(&Item::check_partition_func_processor, 0,
(byte*)(&part_expression_ok)); NULL);
pf_collation_allowed= part_expression_ok; if (!err && is_sub_partitioned() && !list_of_subpart_fields)
part_expression_ok= 1; err= subpart_expr->walk(&Item::check_partition_func_processor, 0,
if (is_sub_partitioned() && !list_of_subpart_fields) NULL);
{
subpart_expr->walk(&Item::check_partition_func_processor, 0,
(byte*)(&part_expression_ok));
}
spf_collation_allowed= part_expression_ok;
} }
if (!pf_collation_allowed || if (err)
!spf_collation_allowed)
{ {
my_error(ER_PARTITION_FUNCTION_IS_NOT_ALLOWED, MYF(0)); my_error(ER_PARTITION_FUNCTION_IS_NOT_ALLOWED, MYF(0));
goto end; goto end;