database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-08-01 03:47:19 +03:00
Code Activity

for consictency, changed to use memcpy_fixed.

Browse Source
This commit is contained in:
unknown
2005-06-16 13:39:54 +02:00
parent 2074572171
commit 17b55ca39b
1 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
sql/sql_select.cc
View File

@ -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)
{ {
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
{ {