database/mariadb
1
0
Fork 0
mirror of https://github.com/MariaDB/server.git synced 2025-07-29 05:21:33 +03:00
Code Activity

Merge igor-inspiron.creware.com:/home/igor/dev/mysql-4.1-0

Browse Source 
into igor-inspiron.creware.com:/home/igor/dev/mysql-5.0-0
This commit is contained in:
igor@igor-inspiron.creware.com
2005-06-13 06:28:23 -07:00
parent d573d0c443 750fca61f9
commit fdce34a385
3 changed files with 82 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_select.cc
View File

@ -11632,9 +11632,9 @@ store_record_in_cache(JOIN_CACHE *cache)
end > str && end[-1] == ' ' ;
end--) ;
length=(uint) (end-str);
memcpy(pos+1,str,length);
*pos=(uchar) length;
pos+=length+1;
memcpy(pos+sizeof(uint), str, length);
*((uint *) pos)= length;
pos+= length+sizeof(uint);
}
else
{
@ -11697,9 +11697,9 @@ read_cached_record(JOIN_TAB *tab)
{
if (copy->strip)
{
memcpy(copy->str,pos+1,length=(uint) *pos);
memset(copy->str+length,' ',copy->length-length);
pos+=1+length;
memcpy(copy->str, pos+sizeof(uint), length= *((uint *) pos));
memset(copy->str+length, ' ', copy->length-length);
pos+= sizeof(uint)+length;
}
else
{