From 4414b56d85d937354e2fb384604394ec3d1ffc56 Mon Sep 17 00:00:00 2001 From: unknown Date: Wed, 14 Jun 2006 19:40:06 -0400 Subject: merge update mysql-test/t/partition.test: merge error --- sql/partition_info.h | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'sql/partition_info.h') diff --git a/sql/partition_info.h b/sql/partition_info.h index f195e555934..3d8c6a40221 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -217,7 +217,7 @@ public: list_of_part_fields(FALSE), list_of_subpart_fields(FALSE), linear_hash_ind(FALSE), fixed(FALSE), is_auto_partitioned(FALSE), from_openfrm(FALSE), - has_null_value(FALSE), has_null_part_id(0) + has_null_value(FALSE) { all_fields_in_PF.clear_all(); all_fields_in_PPF.clear_all(); @@ -251,6 +251,7 @@ public: bool check_list_constants(); bool check_partition_info(THD *thd, handlerton **eng_type, handler *file, ulonglong max_rows); + void print_no_partition_found(TABLE *table); private: static int list_part_cmp(const void* a, const void* b); static int list_part_cmp_unsigned(const void* a, const void* b); -- cgit v1.2.1