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 branch '10.1' into 10.2

Browse Source
This commit is contained in:
Vicențiu Ciorbaru
2017-09-19 12:43:02 +03:00
parent 7d49aab32c ec6042bda0
commit 22c322c649
68 changed files with 1358 additions and 839 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
sql/sql_partition.cc
View File

@ -4355,10 +4355,6 @@ bool compare_partition_options(HA_CREATE_INFO *table_create_info,
option_diffs[errors++]= "MAX_ROWS";
if (part_elem->part_min_rows != table_create_info->min_rows)
option_diffs[errors++]= "MIN_ROWS";
if (part_elem->data_file_name || table_create_info->data_file_name)
option_diffs[errors++]= "DATA DIRECTORY";
if (part_elem->index_file_name || table_create_info->index_file_name)
option_diffs[errors++]= "INDEX DIRECTORY";
for (i= 0; i < errors; i++)
my_error(ER_PARTITION_EXCHANGE_DIFFERENT_OPTION, MYF(0),