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

Manual merge

Browse Source 
mysql-test/t/rpl_ddl.test:
  Auto merged
ndb/test/ndbapi/testBlobs.cpp:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2005-06-16 10:04:41 -07:00
parent af27fd8a33 251363367f
commit 0f57c00481
7 changed files with 71 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
sql/sql_select.cc
View File

@ -812,9 +812,14 @@ JOIN::optimize()
DBUG_RETURN(1);
}
simple_group= 0;
group_list= remove_const(this, group_list, conds,
rollup.state == ROLLUP::STATE_NONE,
&simple_group);
{
ORDER *old_group_list;
group_list= remove_const(this, (old_group_list= group_list), conds,
rollup.state == ROLLUP::STATE_NONE,
&simple_group);
if (old_group_list && !group_list)
select_distinct= 0;
}
if (!group_list && group)
{
order=0; // The output has only one row
@ -11644,9 +11649,9 @@ store_record_in_cache(JOIN_CACHE *cache)
end > str && end[-1] == ' ' ;
end--) ;
length=(uint) (end-str);
memcpy(pos+sizeof(uint), str, length);
*((uint *) pos)= length;
pos+= length+sizeof(uint);
memcpy(pos+sizeof(length), str, length);
memcpy_fixed(pos, &length, sizeof(length));
pos+= length+sizeof(length);
}
else
{
@ -11709,9 +11714,10 @@ read_cached_record(JOIN_TAB *tab)
{
if (copy->strip)
{
memcpy(copy->str, pos+sizeof(uint), length= *((uint *) pos));
memcpy_fixed(&length, pos, sizeof(length));
memcpy(copy->str, pos+sizeof(length), length);
memset(copy->str+length, ' ', copy->length-length);
pos+= sizeof(uint)+length;
pos+= sizeof(length)+length;
}
else
{