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/sql_partition_admin.cc | |
| parent | 4d2131354914f54f85abf0bb8cb4bdd42d817f73 (diff) | |
| parent | f305a7ce4bccbd56520d874e1d81a4f29bc17a96 (diff) | |
| download | mariadb-git-89dc445a55156881318ca94ce042dbaf98e53e26.tar.gz | |
Merge branch '5.5' into 10.0
Diffstat (limited to 'sql/sql_partition_admin.cc')
| -rw-r--r-- | sql/sql_partition_admin.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sql/sql_partition_admin.cc b/sql/sql_partition_admin.cc index 87803c220ea..9b471f97521 100644 --- a/sql/sql_partition_admin.cc +++ b/sql/sql_partition_admin.cc @@ -491,7 +491,7 @@ bool Sql_cmd_alter_table_exchange_partition:: partition_element *part_elem; char *partition_name; char temp_name[FN_REFLEN+1]; - char part_file_name[FN_REFLEN+1]; + char part_file_name[2*FN_REFLEN+1]; char swap_file_name[FN_REFLEN+1]; char temp_file_name[FN_REFLEN+1]; uint swap_part_id; @@ -571,9 +571,9 @@ bool Sql_cmd_alter_table_exchange_partition:: temp_name, "", FN_IS_TMP); if (!(part_elem= part_table->part_info->get_part_elem(partition_name, - part_file_name + - part_file_name_len, - &swap_part_id))) + part_file_name + part_file_name_len, + sizeof(part_file_name) - part_file_name_len, + &swap_part_id))) { // my_error(ER_UNKNOWN_PARTITION, MYF(0), partition_name, // part_table->alias); |