diff options
| author | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-14 09:12:07 -0400 |
|---|---|---|
| committer | unknown <mikael@c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se> | 2006-06-14 09:12:07 -0400 |
| commit | e6170de4c01edaf6a39bd94d84be935f228332dc (patch) | |
| tree | 827438a688b1352593deb848a80ecd9f5c6f17b5 /sql/sql_partition.h | |
| parent | 2ecd916de6f0daebb22f79cd6f0ad09f581c2aec (diff) | |
| parent | 6e9bdcc9e91db27ca37535f7d4989d08727d1902 (diff) | |
| download | mariadb-git-e6170de4c01edaf6a39bd94d84be935f228332dc.tar.gz | |
Merge c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/clean-mysql-5.1
into c-0409e253.1238-1-64736c10.cust.bredbandsbolaget.se:/home/pappa/bug16002
sql/ha_ndbcluster.cc:
Auto merged
sql/sql_partition.h:
Auto merged
sql/sql_show.cc:
Auto merged
sql/sql_yacc.yy:
Auto merged
mysql-test/r/partition.result:
manual merge
mysql-test/r/partition_error.result:
manual merge
mysql-test/r/partition_range.result:
manual merge
mysql-test/t/partition.test:
manual merge
mysql-test/t/partition_error.test:
manual merge
mysql-test/t/partition_range.test:
manual merge
sql/ha_partition.cc:
manual merge
sql/partition_element.h:
manual merge
sql/partition_info.cc:
manual merge
sql/partition_info.h:
manual merge
sql/share/errmsg.txt:
manual merge
sql/sql_partition.cc:
manual merge
sql/sql_table.cc:
manual merge
sql/table.cc:
manual merge
Diffstat (limited to 'sql/sql_partition.h')
| -rw-r--r-- | sql/sql_partition.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/sql/sql_partition.h b/sql/sql_partition.h index 7b07fd2eb53..845180ad592 100644 --- a/sql/sql_partition.h +++ b/sql/sql_partition.h @@ -65,9 +65,8 @@ int get_part_for_delete(const byte *buf, const byte *rec0, partition_info *part_info, uint32 *part_id); void prune_partition_set(const TABLE *table, part_id_range *part_spec); bool check_partition_info(partition_info *part_info,handlerton **eng_type, - handler *file, ulonglong max_rows); -bool fix_partition_func(THD *thd, const char *name, TABLE *table, - bool create_table_ind); + TABLE *table, handler *file, ulonglong max_rows); +bool fix_partition_func(THD *thd, TABLE *table, bool create_table_ind); char *generate_partition_syntax(partition_info *part_info, uint *buf_length, bool use_sql_alloc, bool show_partition_options); @@ -91,6 +90,8 @@ uint32 get_list_array_idx_for_endpoint(partition_info *part_info, uint32 get_partition_id_range_for_endpoint(partition_info *part_info, bool left_endpoint, bool include_endpoint); +bool fix_fields_part_func(THD *thd, Item* func_expr, TABLE *table, + bool is_sub_part, bool is_field_to_be_setup); /* A "Get next" function for partition iterator. |