diff options
| author | Tor Didriksen <tor.didriksen@oracle.com> | 2013-06-14 10:52:23 +0200 |
|---|---|---|
| committer | Tor Didriksen <tor.didriksen@oracle.com> | 2013-06-14 10:52:23 +0200 |
| commit | a040586cceab693b5b689afff841c785afa38e53 (patch) | |
| tree | 635f7a3d45ec27024d2f7e63e79da82fdeb47273 /storage/myisam | |
| parent | 9f7043ab91197decf382553e156aabc87d5f7451 (diff) | |
| download | mariadb-git-a040586cceab693b5b689afff841c785afa38e53.tar.gz | |
Bug#16729109: FIX COMPILATION WARNINGS WITH GCC 4.8
Backport to 5.5
(external Bug#69407 Build warnings with mysql)
Diffstat (limited to 'storage/myisam')
| -rw-r--r-- | storage/myisam/mi_checksum.c | 3 | ||||
| -rw-r--r-- | storage/myisam/mi_key.c | 4 | ||||
| -rw-r--r-- | storage/myisam/mi_packrec.c | 4 |
3 files changed, 5 insertions, 6 deletions
diff --git a/storage/myisam/mi_checksum.c b/storage/myisam/mi_checksum.c index 3d95eb2b609..97503878e56 100644 --- a/storage/myisam/mi_checksum.c +++ b/storage/myisam/mi_checksum.c @@ -33,8 +33,7 @@ ha_checksum mi_checksum(MI_INFO *info, const uchar *buf) length=_mi_calc_blob_length(rec->length- portable_sizeof_char_ptr, buf); - memcpy((char*) &pos, buf+rec->length- portable_sizeof_char_ptr, - sizeof(char*)); + memcpy(&pos, buf+rec->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 5c3d4922956..96b8c14c6ad 100644 --- a/storage/myisam/mi_key.c +++ b/storage/myisam/mi_key.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2010, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -418,7 +418,7 @@ static int _mi_put_key_in_record(register MI_INFO *info, uint keynr, goto err; #endif 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_packrec.c b/storage/myisam/mi_packrec.c index a1a03e20aaf..8548b3ebd94 100644 --- a/storage/myisam/mi_packrec.c +++ b/storage/myisam/mi_packrec.c @@ -1,4 +1,4 @@ -/* Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved. +/* Copyright (c) 2000, 2013, Oracle and/or its affiliates. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -1051,7 +1051,7 @@ static void uf_blob(MI_COLUMNDEF *rec, MI_BIT_BUFF *bit_buff, } decode_bytes(rec,bit_buff,bit_buff->blob_pos,bit_buff->blob_pos+length); _my_store_blob_length((uchar*) to,pack_length,length); - memcpy((char*) to+pack_length, &bit_buff->blob_pos, sizeof(char*)); + memcpy(to+pack_length, &bit_buff->blob_pos, sizeof(char*)); bit_buff->blob_pos+=length; } } |