diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 13:27:35 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-12 13:27:35 +0200 |
| commit | 0628123617128bbaa01e8d14498393e28d514082 (patch) | |
| tree | cbbd5c9d49d48135bc8eb98da8e88131c35f09ac | |
| parent | ccf22b80259e4e8976e28408b5b04e2914234827 (diff) | |
| parent | 86c69263a441dd6fb2de180dba846eb4fc53a5f0 (diff) | |
| download | mariadb-git-0628123617128bbaa01e8d14498393e28d514082.tar.gz | |
Merge 10.2 into bb-10.2-ext
| -rw-r--r-- | storage/rocksdb/ha_rocksdb.cc | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc index 618e7b98a9d..f57593a1d07 100644 --- a/storage/rocksdb/ha_rocksdb.cc +++ b/storage/rocksdb/ha_rocksdb.cc @@ -5971,6 +5971,15 @@ rdb_field_uses_nopad_collation(const my_core::Field *const field) { /* Handle [VAR](CHAR|BINARY) or TEXT|BLOB */ if (type == MYSQL_TYPE_VARCHAR || type == MYSQL_TYPE_STRING || type == MYSQL_TYPE_BLOB) { + + /* + This is technically a NOPAD collation but it's a binary collation + that we can handle. + */ + if (RDB_INDEX_COLLATIONS.find(field->charset()->number) != + RDB_INDEX_COLLATIONS.end()) + return false; + return (field->charset()->state & MY_CS_NOPAD); } return false; |