Commit ee3a9206 authored by unknown's avatar unknown

for consictency, changed to use memcpy_fixed.

parent a2121e0f
...@@ -8112,9 +8112,9 @@ store_record_in_cache(JOIN_CACHE *cache) ...@@ -8112,9 +8112,9 @@ store_record_in_cache(JOIN_CACHE *cache)
end > str && end[-1] == ' ' ; end > str && end[-1] == ' ' ;
end--) ; end--) ;
length=(uint) (end-str); length=(uint) (end-str);
memcpy(pos+2, str, length); memcpy(pos+sizeof(length), str, length);
int2store(pos, length); memcpy_fixed(pos, &length, sizeof(length));
pos+= length+2; pos+= length+sizeof(length);
} }
else else
{ {
...@@ -8177,9 +8177,10 @@ read_cached_record(JOIN_TAB *tab) ...@@ -8177,9 +8177,10 @@ read_cached_record(JOIN_TAB *tab)
{ {
if (copy->strip) if (copy->strip)
{ {
memcpy(copy->str, pos+2, length= uint2korr(pos)); memcpy_fixed(&length, pos, sizeof(length));
memcpy(copy->str, pos+sizeof(length), length);
memset(copy->str+length, ' ', copy->length-length); memset(copy->str+length, ' ', copy->length-length);
pos+= 2+length; pos+= sizeof(length)+length;
} }
else else
{ {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment