Skip to content

MDEV-16768: fix blob key length #837

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
spetrunia merged 1 commit into from
Sep 12, 2018
Merged

MDEV-16768: fix blob key length #837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion sql/field.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8539,7 +8539,9 @@ void Field_blob::sort_string(uchar *to,uint length)
Store length of blob last in blob to shorter blobs before longer blobs
*/
length-= packlength;
store_bigendian(buf.length(), to + length, packlength);

uint key_length = MY_MIN(buf.length(), length);
store_bigendian(key_length, to + length, packlength);
}

#ifndef DBUG_OFF
Expand Down
9 changes: 9 additions & 0 deletions storage/rocksdb/mysql-test/rocksdb_rpl/r/rpl_blob_key.result
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
include/master-slave.inc
[connection master]
CREATE TABLE t1 (b BLOB, i INT, KEY(b(8))) ENGINE=RocksDB;
INSERT INTO t1 VALUES (REPEAT('a',9),1);
UPDATE t1 SET i = 2;
connection slave;
connection master;
DROP TABLE t1;
include/rpl_end.inc
15 changes: 15 additions & 0 deletions storage/rocksdb/mysql-test/rocksdb_rpl/t/rpl_blob_key.test
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
--source include/have_rocksdb.inc
--source include/have_binlog_format_row.inc
--source include/master-slave.inc

CREATE TABLE t1 (b BLOB, i INT, KEY(b(8))) ENGINE=RocksDB;
INSERT INTO t1 VALUES (REPEAT('a',9),1);

UPDATE t1 SET i = 2;

--sync_slave_with_master

# Cleanup
--connection master
DROP TABLE t1;
--source include/rpl_end.inc