diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 18:50:36 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 18:50:36 +0200 |
| commit | 52dea41052bc1be1efbe59c320046d7e62cfd0a6 (patch) | |
| tree | 515c69dbce80f1af73974286de8f87413b1cad23 /storage | |
| parent | 86901216fd4f7eb0844e884203810a0e43fcd103 (diff) | |
| parent | 5ce11d8b4ca2a57968656925a69ed8114d5374f6 (diff) | |
| download | mariadb-git-52dea41052bc1be1efbe59c320046d7e62cfd0a6.tar.gz | |
Merge 5.3->5.5
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/ma_checksum.c | 2 | ||||
| -rw-r--r-- | storage/maria/ma_key.c | 2 | ||||
| -rw-r--r-- | storage/myisam/mi_checksum.c | 3 | ||||
| -rw-r--r-- | storage/myisam/mi_key.c | 2 |
4 files changed, 5 insertions, 4 deletions
diff --git a/storage/maria/ma_checksum.c b/storage/maria/ma_checksum.c index 61ec638053a..da2d40d3687 100644 --- a/storage/maria/ma_checksum.c +++ b/storage/maria/ma_checksum.c @@ -58,7 +58,7 @@ ha_checksum _ma_checksum(MARIA_HA *info, const uchar *record) length= _ma_calc_blob_length(blob_size_length, pos); if (length) { - memcpy((char*) &pos, pos + blob_size_length, sizeof(char*)); + memcpy(&pos, pos + blob_size_length, sizeof(char*)); crc= my_checksum(crc, pos, length); } continue; diff --git a/storage/maria/ma_key.c b/storage/maria/ma_key.c index f62ffcc49a0..246e5fb6d94 100644 --- a/storage/maria/ma_key.c +++ b/storage/maria/ma_key.c @@ -589,7 +589,7 @@ static int _ma_put_key_in_record(register MARIA_HA *info, uint keynr, if (unpack_blobs) { memcpy(record+keyseg->start+keyseg->bit_start, - (char*) &blob_ptr,sizeof(char*)); + &blob_ptr, sizeof(char*)); memcpy(blob_ptr,key,length); blob_ptr+=length; diff --git a/storage/myisam/mi_checksum.c b/storage/myisam/mi_checksum.c index 4c10b28a653..e0a8672760d 100644 --- a/storage/myisam/mi_checksum.c +++ b/storage/myisam/mi_checksum.c @@ -40,7 +40,8 @@ ha_checksum mi_checksum(MI_INFO *info, const uchar *buf) length=_mi_calc_blob_length(column->length- portable_sizeof_char_ptr, buf); - memcpy(&pos, buf+column->length- portable_sizeof_char_ptr, sizeof(char*)); + memcpy(&pos, buf+column->length - portable_sizeof_char_ptr, + sizeof(char*)); break; } case FIELD_VARCHAR: diff --git a/storage/myisam/mi_key.c b/storage/myisam/mi_key.c index dc078ebd401..9a2526ad2cf 100644 --- a/storage/myisam/mi_key.c +++ b/storage/myisam/mi_key.c @@ -424,7 +424,7 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr, if (unpack_blobs) { memcpy(record+keyseg->start+keyseg->bit_start, - &blob_ptr,sizeof(char*)); + &blob_ptr, sizeof(char *)); memcpy(blob_ptr,key,length); blob_ptr+=length; |