diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-12-30 15:50:20 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-12-30 18:30:29 +0100 |
| commit | 67240858b2bfa0afc436d88fc9da0595e1391b60 (patch) | |
| tree | 27dc23ebefa72cb2fd7aaa02722da3ba424bbf9e /sql/partition_info.cc | |
| parent | cf9070a8f7dec309878e464b277db7dbb3556cf0 (diff) | |
| parent | aeefd26ecb1089678e343c64998749e9f2e3a1e4 (diff) | |
| download | mariadb-git-67240858b2bfa0afc436d88fc9da0595e1391b60.tar.gz | |
Merge branch '10.1' into 10.2mariadb-10.2.21
Diffstat (limited to 'sql/partition_info.cc')
| -rw-r--r-- | sql/partition_info.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/sql/partition_info.cc b/sql/partition_info.cc index ee71d0dcf05..d7aec8fd451 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -1713,12 +1713,12 @@ bool partition_info::check_partition_field_length() for (i= 0; i < num_part_fields; i++) store_length+= get_partition_field_store_length(part_field_array[i]); - if (store_length > MAX_KEY_LENGTH) + if (store_length > MAX_DATA_LENGTH_FOR_KEY) DBUG_RETURN(TRUE); store_length= 0; for (i= 0; i < num_subpart_fields; i++) store_length+= get_partition_field_store_length(subpart_field_array[i]); - if (store_length > MAX_KEY_LENGTH) + if (store_length > MAX_DATA_LENGTH_FOR_KEY) DBUG_RETURN(TRUE); DBUG_RETURN(FALSE); } |