[Commits] bbcaf67: Fix compiler warnings

Sergei Petrunia psergey at askmonty.org
Wed Jul 16 11:51:11 EEST 2014


revision-id: bbcaf676457cedc715ee5564db8a0075eba8a3ac
parent(s): bb41f81f7375acb942d18f3816f867da402c0f6a
committer: Sergei Petrunia
branch nick: webscalesql-5.6
timestamp: 2014-07-16 12:51:11 +0400
message:

Fix compiler warnings

-----------------------

 storage/rocksdb/ha_rocksdb.cc |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/storage/rocksdb/ha_rocksdb.cc b/storage/rocksdb/ha_rocksdb.cc
index 5654ebb..b0e9734 100644
--- a/storage/rocksdb/ha_rocksdb.cc
+++ b/storage/rocksdb/ha_rocksdb.cc
@@ -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);
@@ -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);


More information about the commits mailing list