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

bad old merge fixed

Browse Source
This commit is contained in:
serg@serg.mylan
2004-05-15 11:20:42 +02:00
parent 6a594c07c5
commit da63a927f2
3 changed files with 19 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -85,6 +85,15 @@ i
1 1
3 3
drop table t1; drop table t1;
create table t1 ( pk int primary key, name varchar(255) not null, number varchar(255) not null);
insert into t1 values (1, 'Gamma', '123'), (2, 'Gamma Ext', '123a'), (3, 'Alpha', '001'), (4, 'Beta', '200c');
select distinct t1.name as 'Building Name',t1.number as 'Building Number' from t1 order by t1.name asc;
Building Name Building Number
Gamma 123
Gamma Ext 123a
Alpha 001
Beta 200c
drop table t1;
create table t1 (id int not null,col1 int not null,col2 int not null,index(col1)); create table t1 (id int not null,col1 int not null,col2 int not null,index(col1));
insert into t1 values(1,2,2),(2,2,1),(3,1,2),(4,1,1),(5,1,4),(6,2,3),(7,3,1),(8,2,4); insert into t1 values(1,2,2),(2,2,1),(3,1,2),(4,1,1),(5,1,4),(6,2,3),(7,3,1),(8,2,4);
select * from t1 order by col1,col2; select * from t1 order by col1,col2;

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

@ -79,6 +79,16 @@ select distinct i from t1 order by 1-i;
select distinct i from t1 order by mod(i,2),i; select distinct i from t1 order by mod(i,2),i;
drop table t1; drop table t1;
#
# bug#3681
#
create table t1 ( pk int primary key, name varchar(255) not null, number varchar(255) not null);
insert into t1 values (1, 'Gamma', '123'), (2, 'Gamma Ext', '123a'), (3, 'Alpha', '001'), (4, 'Beta', '200c');
select distinct t1.name as 'Building Name',t1.number as 'Building Number' from t1 order by t1.name asc;
drop table t1;
# #
# Order by on first index part # Order by on first index part
# #

1
sql/sql_select.cc
View File

@ -665,7 +665,6 @@ JOIN::optimize()
if (!order && org_order) if (!order && org_order)
skip_sort_order= 1; skip_sort_order= 1;
} }
order= remove_const(this, order, conds, &simple_order);
if (group_list || tmp_table_param.sum_func_count) if (group_list || tmp_table_param.sum_func_count)
{ {
if (! hidden_group_fields) if (! hidden_group_fields)