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

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

Browse Source 
into rurik.mysql.com:/home/igor/dev/mysql-5.0-0


mysql-test/r/group_by.result:
  Auto merged
sql/item.h:
  Auto merged
sql/item_buff.cc:
  Auto merged
sql/sql_select.cc:
  Auto merged
This commit is contained in:
unknown
2005-06-07 03:07:42 -07:00
parent 7a6c62a107 4da133cabf
commit ecd32735e2
5 changed files with 38 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sql/sql_select.cc
View File

@ -12281,7 +12281,7 @@ alloc_group_fields(JOIN *join,ORDER *group)
{
for (; group ; group=group->next)
{
Item_buff *tmp=new_Item_buff(*group->item);
Item_buff *tmp=new_Item_buff(join->thd, *group->item);
if (!tmp || join->group_fields.push_front(tmp))
return TRUE;
}