diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-07 11:30:03 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-07 11:30:03 +0200 |
| commit | 9e11e055ce1461caecbb30e8300dfdcd48af22f1 (patch) | |
| tree | 48f5dc07a29e44a106c37e7e8e3234c62abbebf6 /sql/partition_info.h | |
| parent | 2b5c9bc2c813ea7963959e515da5d60392c35431 (diff) | |
| parent | 6b99859fff6b8c0a52ea45965834c9c3fdfc4cb3 (diff) | |
| download | mariadb-git-9e11e055ce1461caecbb30e8300dfdcd48af22f1.tar.gz | |
Merge branch '10.0' into 10.1
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 df7010b2ab3..ec7374b3e3e 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -340,9 +340,8 @@ public: bool init_column_part(THD *thd); bool add_column_list_value(THD *thd, Item *item); void set_show_version_string(String *packet); - 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 set_used_partition(List<Item> &fields, List<Item> &values, |