diff options
author | Alexander Barkov <bar@mariadb.com> | 2018-06-21 15:17:15 +0400 |
---|---|---|
committer | Alexander Barkov <bar@mariadb.com> | 2018-06-21 15:17:15 +0400 |
commit | fe3f9fa9183ea3d10397b6f7f4d422ae9bba00a4 (patch) | |
tree | 06bfccdf616a96ed15d061b9951ef806f78f156e /sql/field.cc | |
parent | 635c5e32815389bff928c3141e418b3cd2c5b887 (diff) | |
download | mariadb-git-fe3f9fa9183ea3d10397b6f7f4d422ae9bba00a4.tar.gz |
MDEV-12809 Bad column type created for TEXT(1431655798) CHARACTER SET utf8
Diffstat (limited to 'sql/field.cc')
-rw-r--r-- | sql/field.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sql/field.cc b/sql/field.cc index 56948acd8ba..f540c58757f 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -9777,7 +9777,7 @@ void Column_definition::create_length_to_internal_length(void) case MYSQL_TYPE_STRING: case MYSQL_TYPE_VARCHAR: length*= charset->mbmaxlen; - DBUG_ASSERT(length <= UINT_MAX32); + set_if_smaller(length, UINT_MAX32); key_length= (uint32)length; pack_length= calc_pack_length(sql_type, key_length); break; |