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 10.2 into bb-10.2-ext

Browse Source
This commit is contained in:
Marko Mäkelä
2017-09-20 17:47:49 +03:00
parent 4cfef2a5a4 96f06f952d
commit fc3b1a7d2f
230 changed files with 3599 additions and 2155 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),