diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2017-07-06 23:47:33 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2017-07-06 23:47:33 +0200 |
| commit | 89dc445a55156881318ca94ce042dbaf98e53e26 (patch) | |
| tree | 04da8a074a8ceac347cb21e0c6e2ee1d05a990c6 /sql/partition_info.h | |
| parent | 4d2131354914f54f85abf0bb8cb4bdd42d817f73 (diff) | |
| parent | f305a7ce4bccbd56520d874e1d81a4f29bc17a96 (diff) | |
| download | mariadb-git-89dc445a55156881318ca94ce042dbaf98e53e26.tar.gz | |
Merge branch '5.5' into 10.0
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 8ad7b1fd1fd..a80295edde0 100644 --- a/sql/partition_info.h +++ b/sql/partition_info.h @@ -340,9 +340,8 @@ public: bool init_column_part(); 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, |