database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-11-16 20:23:18 +03:00
Code Activity

Merge abotchkov@bk-internal.mysql.com:/home/bk/mysql-4.1

Browse Source 
into deer.(none):/home/hf/work/mysql-4.1.clean
This commit is contained in:
hf@deer.(none)
2005-02-12 20:12:06 +04:00
parent 9ba7392306 56ea00afbd
commit 1393c8a808
1 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
libmysqld/emb_qcache.cc
View File

@@ -71,9 +71,11 @@ void Querycache_stream::store_int(uint i)
cur_data+= 4; cur_data+= 4;
return; return;
} }
memcpy(cur_data, &i, rest_len); char buf[4];
int4store(buf, i);
memcpy(cur_data, buf, rest_len);
use_next_block(); use_next_block();
memcpy(cur_data, ((byte*)&i)+rest_len, 4-rest_len); memcpy(cur_data, buf+rest_len, 4-rest_len);
cur_data+= 4-rest_len; cur_data+= 4-rest_len;
} }
@@ -186,10 +188,12 @@ uint Querycache_stream::load_int()
cur_data+= 4; cur_data+= 4;
return result; return result;
} }
memcpy(&result, cur_data, rest_len); char buf[4];
memcpy(buf, cur_data, rest_len);
use_next_block(); use_next_block();
memcpy(((byte*)&result)+rest_len, cur_data, 4-rest_len); memcpy(buf+rest_len, cur_data, 4-rest_len);
cur_data+= 4-rest_len; cur_data+= 4-rest_len;
result= uint4korr(buf);
return result; return result;
} }
@@ -270,10 +274,10 @@ int Querycache_stream::load_column(MEM_ROOT *alloc, char** column)
return 0; return 0;
} }
len--; len--;
if (!(*column= (char *)alloc_root(alloc, len + 4 + 1))) if (!(*column= (char *)alloc_root(alloc, len + sizeof(uint) + 1)))
return 1; return 1;
int4store(*column, len); *((uint*)*column)= len;
(*column)+= 4; (*column)+= sizeof(uint);
load_str_only(*column, len); load_str_only(*column, len);
return 1; return 1;
} }