diff options
| author | unknown <sanja@montyprogram.com> | 2013-10-29 17:50:13 +0200 |
|---|---|---|
| committer | unknown <sanja@montyprogram.com> | 2013-10-29 17:50:13 +0200 |
| commit | 5ce11d8b4ca2a57968656925a69ed8114d5374f6 (patch) | |
| tree | b7cfbdb5dc2bda809543ae84ca60d7f79227399e /storage | |
| parent | 883af99e7dac91e3f258135a2053e6b8e3c05fc3 (diff) | |
| download | mariadb-git-5ce11d8b4ca2a57968656925a69ed8114d5374f6.tar.gz | |
MariaDB made be compiled by gcc 4.8.1
There was 2 problems:
1) coping/moving of the same type (usually casting) as sizeof() (solved in different ways depends on the cause);
2) using 'const' in SSL_CTX::getVerifyCallback() which return object (not reference) and so copy of the object will be created and 'const' has no sens.
Diffstat (limited to 'storage')
| -rw-r--r-- | storage/maria/ma_blockrec.c | 2 | ||||
| -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 | 2 | ||||
| -rw-r--r-- | storage/myisam/mi_key.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/storage/maria/ma_blockrec.c b/storage/maria/ma_blockrec.c index eeaff327dc4..ad10d950189 100644 --- a/storage/maria/ma_blockrec.c +++ b/storage/maria/ma_blockrec.c @@ -7171,7 +7171,7 @@ my_bool _ma_apply_undo_row_delete(MARIA_HA *info, LSN undo_lsn, memcpy(field_pos, field_length_data, size_length); field_length_data+= size_length; - memcpy(field_pos + size_length, &header, sizeof(&header)); + memcpy(field_pos + size_length, &header, sizeof(header)); header+= blob_length; *blob_lengths++= blob_length; break; 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 1e60e6a8c06..d0efc8fd43d 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 8c408ef7ff5..13dd52db22e 100644 --- a/storage/myisam/mi_checksum.c +++ b/storage/myisam/mi_checksum.c @@ -40,7 +40,7 @@ ha_checksum mi_checksum(MI_INFO *info, const uchar *buf) length=_mi_calc_blob_length(column->length- portable_sizeof_char_ptr, buf); - memcpy((char*) &pos, buf+column->length- portable_sizeof_char_ptr, + memcpy(&pos, buf+column->length- portable_sizeof_char_ptr, sizeof(char*)); break; } diff --git a/storage/myisam/mi_key.c b/storage/myisam/mi_key.c index a3d38269e61..01e32780b17 100644 --- a/storage/myisam/mi_key.c +++ b/storage/myisam/mi_key.c @@ -425,7 +425,7 @@ static int _mi_put_key_in_record(register MI_INFO *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; |