database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-30 16:24:05 +03:00
Code Activity

Merge remote-tracking branch 'origin/10.2' into bb-10.2-ext

Browse Source
This commit is contained in:
Alexander Barkov
2017-07-12 22:54:49 +04:00
parent 0f348bcd96 1d730ac42d
commit daec000450
79 changed files with 7183 additions and 6410 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
sql/sql_partition_admin.cc
View File

@ -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);