diff options
| author | Alexander Barkov <bar@mariadb.org> | 2017-07-12 22:54:49 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.org> | 2017-07-12 22:54:49 +0400 |
| commit | daec0004502a1f8c2ff7d46de92a61b5c4da1d6c (patch) | |
| tree | 4b74130669a2558980be4ede5a2b3144c9f6fcd4 /sql/partition_info.h | |
| parent | 0f348bcd965cd47784634508da2202aba2dc0547 (diff) | |
| parent | 1d730ac42d58b5364690634260f915daea659259 (diff) | |
| download | mariadb-git-daec0004502a1f8c2ff7d46de92a61b5c4da1d6c.tar.gz | |
Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext
Diffstat (limited to 'sql/partition_info.h')
| -rw-r--r-- | sql/partition_info.h | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sql/partition_info.h b/sql/partition_info.h index 4fdd7e1269c..38a353c8507 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -328,9 +328,8 @@ public: bool check_partition_field_length(); bool init_column_part(THD *thd); bool add_column_list_value(THD *thd, Item *item); - partition_element *get_part_elem(const char *partition_name, - char *file_name, - uint32 *part_id); + partition_element *get_part_elem(const char *partition_name, char *file_name, + size_t file_name_size, uint32 *part_id); void report_part_expr_error(bool use_subpart_expr); bool has_same_partitioning(partition_info *new_part_info); private: |