mirror of
https://github.com/MariaDB/server.git
synced 2025-01-30 02:30:06 +01:00
make 5.1 compiling with modern gcc.
This commit is contained in:
parent
f534708bd6
commit
1555f1801d
8 changed files with 9 additions and 9 deletions
mysys
sql
storage
|
@ -176,7 +176,7 @@ my_MD5Final (unsigned char digest[16], my_MD5Context *ctx)
|
|||
putu32(ctx->buf[1], digest + 4);
|
||||
putu32(ctx->buf[2], digest + 8);
|
||||
putu32(ctx->buf[3], digest + 12);
|
||||
memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */
|
||||
memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */
|
||||
}
|
||||
|
||||
#ifndef ASM_MD5
|
||||
|
|
|
@ -7709,7 +7709,7 @@ int Field_blob::store(const char *from,uint length,CHARSET_INFO *cs)
|
|||
if (!String::needs_conversion(length, cs, field_charset, &dummy_offset))
|
||||
{
|
||||
Field_blob::store_length(length);
|
||||
bmove(ptr+packlength,(char*) &from,sizeof(char*));
|
||||
bmove(ptr + packlength, &from, sizeof(char*));
|
||||
return 0;
|
||||
}
|
||||
if (tmpstr.copy(from, length, cs))
|
||||
|
@ -8364,7 +8364,7 @@ int Field_geom::store(const char *from, uint length, CHARSET_INFO *cs)
|
|||
value.copy(from, length, cs);
|
||||
from= value.ptr();
|
||||
}
|
||||
bmove(ptr + packlength, (char*) &from, sizeof(char*));
|
||||
bmove(ptr + packlength, &from, sizeof(char*));
|
||||
}
|
||||
return 0;
|
||||
|
||||
|
|
|
@ -7154,7 +7154,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;
|
||||
|
|
|
@ -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;
|
||||
|
|
|
@ -583,7 +583,7 @@ static int _ma_put_key_in_record(register MARIA_HA *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;
|
||||
|
||||
|
|
|
@ -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;
|
||||
}
|
||||
|
|
|
@ -419,7 +419,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;
|
||||
|
||||
|
|
|
@ -937,7 +937,7 @@ xtPublic xtBool myxt_create_row_from_key(XTOpenTablePtr XT_UNUSED(ot), XTIndexPt
|
|||
*/
|
||||
byte *key_ptr = key; // Cannot take the address of a register variable!
|
||||
memcpy(record+keyseg->start+keyseg->bit_start,
|
||||
(char*) &key_ptr,sizeof(char*));
|
||||
&key_ptr,sizeof(char*));
|
||||
|
||||
my_store_blob_length(record+keyseg->start,
|
||||
(uint) keyseg->bit_start,length);
|
||||
|
|
Loading…
Add table
Reference in a new issue