diff options
| author | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-09 08:56:11 +0300 |
|---|---|---|
| committer | Jan Lindström <jan.lindstrom@mariadb.com> | 2017-08-09 08:56:11 +0300 |
| commit | 56b03e308fb4c0feee166ddf6a707d855affa3c3 (patch) | |
| tree | fc4e16093800cf4cbf1cc54fceb0b7280c4212ba /sql/sql_partition_admin.cc | |
| parent | 4f40f87c48a9ee252f797b5d760a6b6f07cc3815 (diff) | |
| parent | a346a5613ee7c0b17b0b4ce377659c996ef6bb75 (diff) | |
| download | mariadb-git-56b03e308fb4c0feee166ddf6a707d855affa3c3.tar.gz | |
Merge tag 'mariadb-10.0.32' into 10.0-galera
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 f520281135a..2a76c8d6671 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; @@ -586,9 +586,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); |