diff options
author | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-23 17:17:55 -0300 |
---|---|---|
committer | Davi Arnaut <davi.arnaut@oracle.com> | 2010-07-23 17:17:55 -0300 |
commit | e001970cc7ca527ea7e81647d2fe4b6b5afd4478 (patch) | |
tree | b3bf82e28ac654006ee9f366503dd6a64386db14 /storage/myisam/mi_dynrec.c | |
parent | 507ca08ff6a731c811a82869f85ba5166e8a9df1 (diff) | |
download | mariadb-git-e001970cc7ca527ea7e81647d2fe4b6b5afd4478.tar.gz |
WL#5498: Remove dead and unused source code
Remove workarounds for ancient systems.
mysys/default.c:
Make cast more explicit to ensure a correct offset.
Diffstat (limited to 'storage/myisam/mi_dynrec.c')
-rw-r--r-- | storage/myisam/mi_dynrec.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/storage/myisam/mi_dynrec.c b/storage/myisam/mi_dynrec.c index 37c5c34658e..f429edd2759 100644 --- a/storage/myisam/mi_dynrec.c +++ b/storage/myisam/mi_dynrec.c @@ -995,7 +995,7 @@ uint _mi_rec_pack(MI_INFO *info, register uchar *to, char *temp_pos; size_t tmp_length=length-portable_sizeof_char_ptr; memcpy((uchar*) to,from,tmp_length); - memcpy_fixed(&temp_pos,from+tmp_length,sizeof(char*)); + memcpy(&temp_pos,from+tmp_length,sizeof(char*)); memcpy(to+tmp_length,temp_pos,(size_t) blob->length); to+=tmp_length+blob->length; } @@ -1310,9 +1310,9 @@ ulong _mi_rec_unpack(register MI_INFO *info, register uchar *to, uchar *from, from_left - size_length < blob_length || from_left - size_length - blob_length < min_pack_length) goto err; - memcpy((uchar*) to,(uchar*) from,(size_t) size_length); + memcpy(to, from, (size_t) size_length); from+=size_length; - memcpy_fixed((uchar*) to+size_length,(uchar*) &from,sizeof(char*)); + memcpy(to+size_length, &from, sizeof(char*)); from+=blob_length; } else |