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 /sql/field.h | |
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 'sql/field.h')
-rw-r--r-- | sql/field.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/sql/field.h b/sql/field.h index 53d15c63494..7b250c34fe4 100644 --- a/sql/field.h +++ b/sql/field.h @@ -1762,22 +1762,22 @@ public: void put_length(uchar *pos, uint32 length); inline void get_ptr(uchar **str) { - memcpy_fixed((uchar*) str,ptr+packlength,sizeof(uchar*)); + memcpy(str, ptr+packlength, sizeof(uchar*)); } inline void get_ptr(uchar **str, uint row_offset) { - memcpy_fixed((uchar*) str,ptr+packlength+row_offset,sizeof(char*)); + memcpy(str, ptr+packlength+row_offset, sizeof(char*)); } inline void set_ptr(uchar *length, uchar *data) { memcpy(ptr,length,packlength); - memcpy_fixed(ptr+packlength,&data,sizeof(char*)); + memcpy(ptr+packlength, &data,sizeof(char*)); } void set_ptr_offset(my_ptrdiff_t ptr_diff, uint32 length, uchar *data) { uchar *ptr_ofs= ADD_TO_PTR(ptr,ptr_diff,uchar*); store_length(ptr_ofs, packlength, length); - memcpy_fixed(ptr_ofs+packlength,&data,sizeof(char*)); + memcpy(ptr_ofs+packlength, &data, sizeof(char*)); } inline void set_ptr(uint32 length, uchar *data) { @@ -1796,7 +1796,7 @@ public: return 1; } tmp=(uchar*) value.ptr(); - memcpy_fixed(ptr+packlength,&tmp,sizeof(char*)); + memcpy(ptr+packlength, &tmp, sizeof(char*)); return 0; } virtual uchar *pack(uchar *to, const uchar *from, |