diff options
| author | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-19 17:28:22 +0200 |
|---|---|---|
| committer | Marko Mäkelä <marko.makela@mariadb.com> | 2017-12-19 17:28:22 +0200 |
| commit | 0436a0ff3ccb837a8d3e5ed58628d6a23f16ab6d (patch) | |
| tree | f5971fa4524ce2da166870930f03b970520ad0c2 /storage/rocksdb/rdb_datadic.cc | |
| parent | 0fd3def284b78dff71590686e8f82571fc3808e1 (diff) | |
| parent | 88aff5f471d3d9ae8ecc2f909bcf5bd0ddd6aa7c (diff) | |
| download | mariadb-git-0436a0ff3ccb837a8d3e5ed58628d6a23f16ab6d.tar.gz | |
Merge bb-10.2-ext into 10.3
Diffstat (limited to 'storage/rocksdb/rdb_datadic.cc')
| -rw-r--r-- | storage/rocksdb/rdb_datadic.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/storage/rocksdb/rdb_datadic.cc b/storage/rocksdb/rdb_datadic.cc index 22d117f74ad..f4749d0c7cf 100644 --- a/storage/rocksdb/rdb_datadic.cc +++ b/storage/rocksdb/rdb_datadic.cc @@ -2921,7 +2921,7 @@ std::array<const Rdb_collation_codec *, MY_ALL_CHARSETS_SIZE> rdb_collation_data; mysql_mutex_t rdb_collation_data_mutex; -static bool rdb_is_collation_supported(const my_core::CHARSET_INFO *const cs) { +bool rdb_is_collation_supported(const my_core::CHARSET_INFO *const cs) { return cs->strxfrm_multiply==1 && cs->mbmaxlen == 1 && !(cs->state & (MY_CS_BINSORT | MY_CS_NOPAD)); } |