database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

BUG#19801: Valgrind error in check_list_constants

Browse Source 
Needed some special handling of the case when no_list_values == 0
This commit is contained in:
mikael@c-870ae253.1238-1-64736c10.cust.bredbandsbolaget.se
2006-05-30 00:08:48 -04:00
parent 2e6b51579b
commit d3ea79ff52
4 changed files with 58 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
sql/sql_partition.cc
View File

@ -2257,8 +2257,8 @@ static uint32 get_part_id_linear_key(partition_info *part_info,
int get_partition_id_list(partition_info *part_info,
uint32 *part_id,
longlong *func_value)
uint32 *part_id,
longlong *func_value)
{
LIST_PART_ENTRY *list_array= part_info->list_array;
int list_index;
@ -2351,7 +2351,8 @@ uint32 get_list_array_idx_for_endpoint(partition_info *part_info,
uint min_list_index= 0, max_list_index= part_info->no_list_values - 1;
/* Get the partitioning function value for the endpoint */
longlong part_func_value= part_val_int(part_info->part_expr);
while (max_list_index >= min_list_index)
DBUG_ASSERT(part_info->no_list_values);
do
{
list_index= (max_list_index + min_list_index) >> 1;
list_value= list_array[list_index].list_value;
@ -2367,7 +2368,7 @@ uint32 get_list_array_idx_for_endpoint(partition_info *part_info,
{
DBUG_RETURN(list_index + test(left_endpoint ^ include_endpoint));
}
}
} while (max_list_index >= min_list_index);
notfound:
if (list_value < part_func_value)
list_index++;
@ -6194,6 +6195,18 @@ int get_part_iter_for_interval_via_mapping(partition_info *part_info,
part_iter->get_next= get_next_partition_id_list;
part_iter->part_info= part_info;
part_iter->ret_null_part= part_iter->ret_null_part_orig= FALSE;
if (max_endpoint_val == 0)
{
/*
We handle this special case without optimisations since it is
of little practical value but causes a great number of complex
checks later in the code.
*/
part_iter->part_nums.start= part_iter->part_nums.end= 0;
part_iter->part_nums.cur= 0;
part_iter->ret_null_part= part_iter->ret_null_part_orig= TRUE;
return -1;
}
}
else
DBUG_ASSERT(0);