mirror/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2026-05-16 03:47:17 +02:00
Code Issues Projects Releases Packages Wiki Activity

merge 5.5->10.0-base

Browse source
This commit is contained in:
unknown 2013-10-29 20:53:05 +02:00
commit f4d5d849fd
29 changed files with 270 additions and 91 deletions
Download patch file Download diff file Expand all files Collapse all files

2
storage/maria/ma_key.c
View file

@ -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;