diff options
| author | Alexander Barkov <bar@mariadb.com> | 2019-10-08 08:05:21 +0400 |
|---|---|---|
| committer | Alexander Barkov <bar@mariadb.com> | 2019-10-08 08:05:21 +0400 |
| commit | 04a5dab2edce4f6dbe24e0fef64d4621bcbfa9bd (patch) | |
| tree | 8c7772a9410c3ad3448ede7b6881ec7e19ffc8b5 /storage | |
| parent | 6afb2a37fd186318dee1467a7a9bc92179bcb601 (diff) | |
| download | mariadb-git-bb-mdev-274.tar.gz | |
MDEV-274 The data type for IPv6/IPv4 addresses in MariaDBbb-mdev-274
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/innobase/handler/ha_innodb.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/innobase/handler/ha_innodb.cc b/storage/innobase/handler/ha_innodb.cc index 81c571e66e7..2b589a327d9 100644 --- a/storage/innobase/handler/ha_innodb.cc +++ b/storage/innobase/handler/ha_innodb.cc @@ -6731,7 +6731,7 @@ get_innobase_type_from_mysql_type( } case MYSQL_TYPE_BIT: case MYSQL_TYPE_STRING: - if (field->binary()) { + if (field->binary() || field->key_type() == HA_KEYTYPE_BINARY) { return(DATA_FIXBINARY); } else if (field->charset() == &my_charset_latin1) { return(DATA_CHAR); |