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/sql_partition_admin.cc | |
| 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/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 c727d749300..ed330bcc7b9 100644 --- a/sql/sql_partition_admin.cc +++ b/sql/sql_partition_admin.cc @@ -485,7 +485,7 @@ bool Sql_cmd_alter_table_exchange_partition:: partition_element *part_elem; const 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; @@ -580,9 +580,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); |