summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Vojtovich <svoj@mariadb.org>2017-08-28 22:59:40 +0400
committerSergey Vojtovich <svoj@mariadb.org>2017-08-28 22:59:40 +0400
commitb8c6a2ff4a11425b4e11156dc5f981cfbf67e27d (patch)
tree5679c9ac3a702cdeeb6f2144905810546fae5245
parent5626786b055a5990a8913e92e41550f5fea974ec (diff)
downloadmariadb-git-bb-10.3-MDEV-11371.tar.gz
fixup! MDEV-11371 - column compressionbb-10.3-MDEV-11371
-rw-r--r--sql/field.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc
index 3d702a2369a..af63137e1ef 100644
--- a/sql/field.cc
+++ b/sql/field.cc
@@ -7672,7 +7672,8 @@ uint Field_varstring::is_equal(Create_field *new_field)
new_field->charset == field_charset &&
!new_field->compression_method() == !compression_method())
{
- if (new_field->length == max_display_length())
+ if (new_field->length - MY_TEST(new_field->compression_method()) ==
+ max_display_length())
return IS_EQUAL_YES;
if (new_field->length > max_display_length() &&
((new_field->length <= 255 && max_display_length() <= 255) ||