diff options
| author | Sergei Golubchik <serg@mariadb.org> | 2018-09-21 15:03:37 +0200 |
|---|---|---|
| committer | Sergei Golubchik <serg@mariadb.org> | 2018-09-21 15:05:54 +0200 |
| commit | 27235eed67dc2bd160ee0df0271850c23e637175 (patch) | |
| tree | f1b3367dfe35b5d52f6ef4bd8e211e176b7d8a7c /sql/field.cc | |
| parent | bc7d40d0324f4062f44214e9db4dfd9c347700b0 (diff) | |
| download | mariadb-git-27235eed67dc2bd160ee0df0271850c23e637175.tar.gz | |
Revert "MDEV-16768: fix blob key length"
This reverts commit 87609324e0ee
RocksDB was making invalid assumption about Field_blob::make_sort_key,
and the commit 87609324e0ee changed Field_blob::make_sort_key to match
RocksDB assumptions.
It also unintentionaly broke sys_vars.max_sort_length_func
Diffstat (limited to 'sql/field.cc')
| -rw-r--r-- | sql/field.cc | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/sql/field.cc b/sql/field.cc index ec02ff0808e..7eb277e23d8 100644 --- a/sql/field.cc +++ b/sql/field.cc @@ -8546,9 +8546,7 @@ void Field_blob::sort_string(uchar *to,uint length) Store length of blob last in blob to shorter blobs before longer blobs */ length-= packlength; - - uint key_length = MY_MIN(buf.length(), length); - store_bigendian(key_length, to + length, packlength); + store_bigendian(buf.length(), to + length, packlength); } #ifdef DBUG_ASSERT_EXISTS |