diff options
author | unknown <mikael/pappa@dator5.(none)> | 2006-10-16 15:40:40 -0400 |
---|---|---|
committer | unknown <mikael/pappa@dator5.(none)> | 2006-10-16 15:40:40 -0400 |
commit | e1ff81bbce1bb71b447b754b47521db3e0cd92b0 (patch) | |
tree | 3635695d4cd8a873ae2eac0d07692901393eedfc /sql/sql_partition.h | |
parent | ef9e4ab6aa8ffa5a82205ab25f099477e04a6c10 (diff) | |
parent | 93f4daf1b45f425057138b575caed00d489d002b (diff) | |
download | mariadb-git-e1ff81bbce1bb71b447b754b47521db3e0cd92b0.tar.gz |
Merge dator5.(none):/home/pappa/clean-mysql-5.1
into dator5.(none):/home/pappa/bug18198
mysql-test/r/partition.result:
Auto merged
sql/ha_ndbcluster.cc:
Auto merged
sql/ha_partition.cc:
Auto merged
sql/ha_partition.h:
Auto merged
sql/item_func.h:
Auto merged
sql/partition_info.cc:
Auto merged
sql/sql_partition.cc:
Auto merged
sql/sql_partition.h:
Auto merged
sql/sql_table.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
sql/item_cmpfunc.h:
e
Diffstat (limited to 'sql/sql_partition.h')
-rw-r--r-- | sql/sql_partition.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/sql/sql_partition.h b/sql/sql_partition.h index 68348672d08..4372c26a851 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. |