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

Merge tulin@bk-internal.mysql.com:/home/bk/mysql-5.0

Browse Source 
into dl145b.mysql.com:/home/ndbdev/tomas/mysql-5.1
This commit is contained in:
tulin@dl145b.mysql.com
2005-06-17 23:13:38 +02:00
parent 6e9427544d 362a83d2f2
commit ebc2050c25
24 changed files with 171 additions and 175 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
sql/sql_select.cc
View File

@@ -138,7 +138,7 @@ end_unique_update(JOIN *join, JOIN_TAB *join_tab, bool end_of_records);
static enum_nested_loop_state
end_write_group(JOIN *join, JOIN_TAB *join_tab, bool end_of_records);
static int test_if_group_changed(List<Item_buff> &list);
static int test_if_group_changed(List<Cached_item> &list);
static int join_read_const_table(JOIN_TAB *tab, POSITION *pos);
static int join_read_system(JOIN_TAB *tab);
static int join_read_const(JOIN_TAB *tab);
@@ -582,7 +582,7 @@ JOIN::optimize()
MEMROOT for prepared statements and stored procedures.
*/
Item_arena *arena= thd->current_arena, backup;
Query_arena *arena= thd->current_arena, backup;
if (arena->is_conventional())
arena= 0; // For easier test
else
@@ -12312,7 +12312,7 @@ alloc_group_fields(JOIN *join,ORDER *group)
{
for (; group ; group=group->next)
{
Item_buff *tmp=new_Item_buff(join->thd, *group->item);
Cached_item *tmp=new_Cached_item(join->thd, *group->item);
if (!tmp || join->group_fields.push_front(tmp))
return TRUE;
}
@@ -12323,12 +12323,12 @@ alloc_group_fields(JOIN *join,ORDER *group)
static int
test_if_group_changed(List<Item_buff> &list)
test_if_group_changed(List<Cached_item> &list)
{
DBUG_ENTER("test_if_group_changed");
List_iterator<Item_buff> li(list);
List_iterator<Cached_item> li(list);
int idx= -1,i;
Item_buff *buff;
Cached_item *buff;
for (i=(int) list.elements-1 ; (buff=li++) ; i--)
{