diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 22:20:45 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 22:20:45 +0200 |
| commit | 97ecffc8ee11863bfb3075041b85a571eafa494f (patch) | |
| tree | 1943b382cfb10d77c564c1bdb1d02b12adb88668 /storage/maria | |
| parent | 0fdb3bcfdbfa5d7cad28adc1c0f7c0958cdab2e0 (diff) | |
| parent | f4d5d849fd3b526d38ca6eb083fd0b290eb0eda7 (diff) | |
| download | mariadb-git-97ecffc8ee11863bfb3075041b85a571eafa494f.tar.gz | |
merge 10.0-base -> 10.0
Diffstat (limited to 'storage/maria')
| -rw-r--r-- | storage/maria/ma_checksum.c | 2 | ||||
| -rw-r--r-- | storage/maria/ma_key.c | 2 |
2 files changed, 2 insertions, 2 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 a3553801eaa..53a7479cd4e 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; |