diff options
| author | unknown <mikael/pappa@dator5.(none)> | 2006-07-12 11:33:22 -0400 |
|---|---|---|
| committer | unknown <mikael/pappa@dator5.(none)> | 2006-07-12 11:33:22 -0400 |
| commit | 840840bda05703cdfbefd26245cf24f990d5fbca (patch) | |
| tree | c3d9a5a489a6a7dc750b00cf189b565d4a6f3597 /sql/partition_info.h | |
| parent | 16c54768ba01d9138043ffa8b426b5d3bd14931b (diff) | |
| parent | 57e881430ef79f9eeb02cd08b5c544cb85be1d66 (diff) | |
| download | mariadb-git-840840bda05703cdfbefd26245cf24f990d5fbca.tar.gz | |
Merge mronstrom@bk-internal.mysql.com:/home/bk/bugs/bug18198
into dator5.(none):/home/pappa/bug18198
mysql-test/r/partition.result:
Auto merged
mysql-test/t/partition.test:
Auto merged
sql/item_cmpfunc.h:
Auto merged
sql/item_strfunc.h:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/partition_info.cc:
manual merge
sql/partition_info.h:
manual merge
sql/sql_table.cc:
manual merge
Diffstat (limited to 'sql/partition_info.h')
| -rw-r--r-- | sql/partition_info.h | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/sql/partition_info.h b/sql/partition_info.h index d938d21653a..a7dd7bcfab2 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -188,6 +188,8 @@ public: bool is_auto_partitioned; bool from_openfrm; bool has_null_value; + char pf_collation_allowed; + char spf_collation_allowed; partition_info() @@ -217,7 +219,9 @@ 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_value(FALSE), + pf_collation_allowed(0), + spf_collation_allowed(0) { all_fields_in_PF.clear_all(); all_fields_in_PPF.clear_all(); @@ -250,7 +254,8 @@ public: bool check_range_constants(); bool check_list_constants(); bool check_partition_info(THD *thd, handlerton **eng_type, - handler *file, HA_CREATE_INFO *info); + handler *file, HA_CREATE_INFO *info, + bool check_partition_function); void print_no_partition_found(TABLE *table); private: static int list_part_cmp(const void* a, const void* b); |