summaryrefslogtreecommitdiff
path: root/mysql-test
diff options
context:
space:
mode:
authorserg@serg.mylan <>2004-05-17 11:05:19 +0200
committerserg@serg.mylan <>2004-05-17 11:05:19 +0200
commitb269d4ad219ee97f1e6f2f4e97a137919f4b3213 (patch)
treee1a5b475ef2c85df3b48ec1f2ba20318a72e7978 /mysql-test
parent3f5ce7bd25397efb7a56a2b1ee0d2c638c3cf3ef (diff)
parentbc71d98a039d80cf0281f8745933f3e75a4f376a (diff)
downloadmariadb-git-b269d4ad219ee97f1e6f2f4e97a137919f4b3213.tar.gz
Merge bk-internal:/home/bk/mysql-4.1/
into serg.mylan:/usr/home/serg/Abk/mysql-4.1
Diffstat (limited to 'mysql-test')
-rw-r--r--mysql-test/r/order_by.result4
1 files changed, 2 insertions, 2 deletions
diff --git a/mysql-test/r/order_by.result b/mysql-test/r/order_by.result
index 5edffdacc98..694dc26bcde 100644
--- a/mysql-test/r/order_by.result
+++ b/mysql-test/r/order_by.result
@@ -89,10 +89,10 @@ create table t1 ( pk int primary key, name varchar(255) not null, number v
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
+Gamma 123
+Gamma Ext 123a
drop table t1;
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);