Skip to content

Commit

Permalink
Fix compiler warnings
Browse files Browse the repository at this point in the history
  • Loading branch information
spetrunia authored and jtolmer committed Jan 5, 2016
1 parent 5006198 commit 46c09fc
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions storage/rocksdb/ha_rocksdb.cc
Original file line number Diff line number Diff line change
Expand Up @@ -706,7 +706,7 @@ void ha_rocksdb::convert_record_to_storage_format(rocksdb::Slice *packed_rec)
uint32 value_len= blob->get_length();
uint length_bytes= blob->pack_length() - 8;
char *data_ptr;
memcpy(&data_ptr, blob->ptr + length_bytes, sizeof(uchar*));
memcpy(&data_ptr, blob->ptr + length_bytes, sizeof(uchar**));

storage_record.append(data_ptr, value_len);
uint32 size_to_write= htons(value_len);
Expand Down Expand Up @@ -785,7 +785,7 @@ void ha_rocksdb::unpack_blobs_from_retrieved_record(uchar *buf)
// set 8-byte pointer to 0, like innodb does.
memset(blob->ptr + length_bytes, 0, 8);

memcpy(blob->ptr + length_bytes, &blob_ptr, sizeof(uchar*));
memcpy(blob->ptr + length_bytes, &blob_ptr, sizeof(uchar**));

blob_ptr += value_len;
blob->move_field_offset(-ptr_diff);
Expand Down

0 comments on commit 46c09fc

Please sign in to comment.