Commit a1d55ea0 authored by serg@serg.mylan's avatar serg@serg.mylan

cleanup for bug#11167.

portability alignment issues.
parent 362a45fd
No related merge requests found
...@@ -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+sizeof(uint), str, length); memcpy(pos+2, str, length);
*((uint *) pos)= length; int2store(pos, length);
pos+= length+sizeof(uint); pos+= length+2;
} }
else else
{ {
...@@ -8177,9 +8177,9 @@ read_cached_record(JOIN_TAB *tab) ...@@ -8177,9 +8177,9 @@ read_cached_record(JOIN_TAB *tab)
{ {
if (copy->strip) if (copy->strip)
{ {
memcpy(copy->str, pos+sizeof(uint), length= *((uint *) pos)); memcpy(copy->str, pos+2, length= uint2korr(pos));
memset(copy->str+length, ' ', copy->length-length); memset(copy->str+length, ' ', copy->length-length);
pos+= sizeof(uint)+length; pos+= 2+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