From 288da1d759874293fdfdb06f15194b826d7dadb4 Mon Sep 17 00:00:00 2001 From: unknown Date: Tue, 26 Sep 2006 16:30:39 -0400 Subject: Final step of Take 7 on review fixes of this fairly complex bug mysql-test/r/partition.result: Merge fix sql/partition_info.cc: Moved method from sql_partition.cc to the partition_info class sql/partition_info.h: Introduced a number of charset related arrays Removed some bools that could be checked by checking arrays instead sql/sql_partition.cc: Introduced a number of charset related arrays Removed some bools that could be checked by checking arrays instead Made method of common complex if-statement Made that method and check of partition function fields public methods to enable use from partition_info class. Moved method to partition_info class Optimised copy_to_part_field_buffers method to avoid as much as possible calculations in those. Also avoided double calls when both subpartitioning and partitioning Handled review comments sql/sql_partition.h: New methods public for use in partition_info class sql/sql_yacc.yy: Missed this in previous merge and review fixes --- sql/sql_partition.h | 3 +++ 1 file changed, 3 insertions(+) (limited to 'sql/sql_partition.h') diff --git a/sql/sql_partition.h b/sql/sql_partition.h index e34d71dfdc5..c5b930162a9 100644 --- a/sql/sql_partition.h +++ b/sql/sql_partition.h @@ -93,6 +93,9 @@ uint32 get_partition_id_range_for_endpoint(partition_info *part_info, bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table, bool is_sub_part, bool is_field_to_be_setup); +bool check_part_func_fields(Field **ptr, bool ok_with_charsets); +bool field_is_partition_charset(Field *field); + /* A "Get next" function for partition iterator. -- cgit v1.2.1