Revert "MDEV-16768: fix blob key length"

This reverts commit 8760932 RocksDB was making invalid assumption about Field_blob::make_sort_key, and the commit 8760932 changed Field_blob::make_sort_key to match RocksDB assumptions. It also unintentionaly broke sys_vars.max_sort_length_func
MariaDB · Sep 21, 2018 · 27235ee · 27235ee
1 parent bc7d40d
commit 27235ee
Show file tree

Hide file tree

Showing 3 changed files with 1 addition and 27 deletions.
diff --git 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

diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_blob_key.result b/storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_blob_key.result
diff --git a/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_blob_key.test b/storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_blob_key.test