diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2019-01-03 13:09:41 +0100 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2019-01-03 13:09:41 +0100 |
| commit | 6bb11efa4a7ba813eb4aa2548f95b7297d70f3d7 (patch) | |
| tree | 3c2dfb2dfbbb0a2471bdcfb0f0c122f823cc80ab /sql/partition_info.cc | |
| parent | ab4bc8442094a2be8cdb74bfcddfccede81ac03d (diff) | |
| parent | 842402e4df35c230e7a416ce3ef8df3055f03d60 (diff) | |
| download | mariadb-git-6bb11efa4a7ba813eb4aa2548f95b7297d70f3d7.tar.gz | |
Merge branch '10.2' into 10.3
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 e24038f96ab..0ac4014a669 100644 --- a/sql/partition_info.cc +++ b/sql/partition_info.cc @@ -1516,12 +1516,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); } |