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

order by group_func

Browse Source
This commit is contained in:
serg@serg.mylan
2004-11-25 17:02:44 +01:00
parent 5924413db6
commit 831c02463c
3 changed files with 21 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
mysql-test/r/order_by.result
View File

@ -733,3 +733,10 @@ xxxxxxxxxxxxxxxxxxxaa
xxxxxxxxxxxxxxxxxxxx xxxxxxxxxxxxxxxxxxxx
xxxxxxxxxxxxxxxxxxxz xxxxxxxxxxxxxxxxxxxz
drop table t1; drop table t1;
create table t1 (a int not null, b int not null, c int not null);
insert t1 values (1,1,1),(1,1,2),(1,2,1);
select a, b from t1 group by a, b order by sum(c);
a b
1 2
1 1
drop table t1;

6
mysql-test/t/order_by.test
View File

@ -500,3 +500,9 @@ insert into t1 set a = concat(repeat('x', 19), 'aa');
set max_sort_length=20; set max_sort_length=20;
select a from t1 order by a; select a from t1 order by a;
drop table t1; drop table t1;
create table t1 (a int not null, b int not null, c int not null);
insert t1 values (1,1,1),(1,1,2),(1,2,1);
select a, b from t1 group by a, b order by sum(c);
drop table t1;

14
sql/sql_select.cc
View File

@ -262,11 +262,13 @@ inline int setup_without_group(THD *thd, Item **ref_pointer_array,
save_allow_sum_func= thd->allow_sum_func; save_allow_sum_func= thd->allow_sum_func;
thd->allow_sum_func= 0; thd->allow_sum_func= 0;
res= (setup_conds(thd, tables, conds) || res= setup_conds(thd, tables, conds);
setup_order(thd, ref_pointer_array, tables, fields, all_fields, thd->allow_sum_func= save_allow_sum_func;
order) || res= res || setup_order(thd, ref_pointer_array, tables, fields, all_fields,
setup_group(thd, ref_pointer_array, tables, fields, all_fields, order);
group, hidden_group_fields)); thd->allow_sum_func= 0;
res= res || setup_group(thd, ref_pointer_array, tables, fields, all_fields,
group, hidden_group_fields);
thd->allow_sum_func= save_allow_sum_func; thd->allow_sum_func= save_allow_sum_func;
DBUG_RETURN(res); DBUG_RETURN(res);
} }
@ -11330,7 +11332,7 @@ int setup_order(THD *thd, Item **ref_pointer_array, TABLE_LIST *tables,
setup_group() setup_group()
thd Thread handler thd Thread handler
ref_pointer_array We store references to all fields that was not in ref_pointer_array We store references to all fields that was not in
'fields' here. 'fields' here.
fields All fields in the select part. Any item in 'order' fields All fields in the select part. Any item in 'order'
that is part of these list is replaced by a pointer that is part of these list is replaced by a pointer
to this fields. to this fields.