diff options
| author | unknown <mikael@dator5.(none)> | 2006-06-23 01:21:26 -0400 |
|---|---|---|
| committer | unknown <mikael@dator5.(none)> | 2006-06-23 01:21:26 -0400 |
| commit | 604227e855b874b72541703f439b4b24f9cf142e (patch) | |
| tree | 8a5d830c934165bdeafc31953e93b8856ce8e72f /sql/partition_info.h | |
| parent | 3856cdb89b3753bb56e56b2a8629a2dd8d2d3deb (diff) | |
| download | mariadb-git-604227e855b874b72541703f439b4b24f9cf142e.tar.gz | |
BUG#18198: Less flexibility in defining partition functions
Changed test for functions if they are supported.
3 categories:
1) Fully supported
2) Supported for single character collations
3) Supported for binary collations
mysql-test/r/partition.result:
Changed test case since no longer supported to use multicharacter collations
in comparisons
mysql-test/t/partition.test:
Changed test case since no longer supported to use multicharacter collations
in comparisons
sql/item.h:
Changed test for functions if they are supported.
3 categories:
1) Fully supported
2) Supported for single character collations
3) Supported for binary collations
sql/item_cmpfunc.h:
Changed test for functions if they are supported.
3 categories:
1) Fully supported
2) Supported for single character collations
3) Supported for binary collations
sql/item_func.h:
Changed test for functions if they are supported.
3 categories:
1) Fully supported
2) Supported for single character collations
3) Supported for binary collations
sql/item_strfunc.h:
Changed test for functions if they are supported.
3 categories:
1) Fully supported
2) Supported for single character collations
3) Supported for binary collations
sql/item_timefunc.h:
Changed test for functions if they are supported.
3 categories:
1) Fully supported
2) Supported for single character collations
3) Supported for binary collations
sql/item_xmlfunc.h:
Changed test for functions if they are supported.
3 categories:
1) Fully supported
2) Supported for single character collations
3) Supported for binary collations
sql/partition_info.cc:
Changed test for functions if they are supported.
3 categories:
1) Fully supported
2) Supported for single character collations
3) Supported for binary collations
sql/partition_info.h:
Changed test for functions if they are supported.
3 categories:
1) Fully supported
2) Supported for single character collations
3) Supported for binary collations
sql/sql_partition.cc:
Changed test for functions if they are supported.
3 categories:
1) Fully supported
2) Supported for single character collations
3) Supported for binary collations
sql/sql_table.cc:
Changed test for functions if they are supported.
3 categories:
1) Fully supported
2) Supported for single character collations
3) Supported for binary collations
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 3d8c6a40221..e02b06991d3 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, ulonglong max_rows); + handler *file, ulonglong max_rows, + bool check_partition_function); void print_no_partition_found(TABLE *table); private: static int list_part_cmp(const void* a, const void* b); |