Commit 6603f7a8 authored by unknown's avatar unknown
Browse files

Merge mysql.com:/home/jonas/src/mysql-4.1 

into mysql.com:/home/jonas/src/mysql-5.0


mysql-test/r/order_by.result:
  Auto merged
mysql-test/t/order_by.test:
  Auto merged
parents 9e4df02f d2e2de1b

mysql-test/r/order_by.result

+17 −0
Original line number Diff line number Diff line
@@ -778,3 +778,20 @@ sid wnid 
39560	01019090000

37994	01019090000

drop table t1;

CREATE TABLE t1 (a int);

INSERT INTO t1 VALUES (2), (1), (1), (2), (1);

SELECT a FROM t1 ORDER BY a;

a

1

1

1

2

2

(SELECT a FROM t1) ORDER BY a;

a

1

1

1

2

2

DROP TABLE t1;

mysql-test/t/order_by.test

+10 −0
Original line number Diff line number Diff line
@@ -539,3 +539,13 @@ explain select * from t1 where wnid like '0101%' order by wnid; 
select * from t1 where wnid like '0101%' order by wnid;



drop table t1;



#

# Bug #7672 - a wrong result for a select query in braces followed by order by

#



CREATE TABLE t1 (a int);

INSERT INTO t1 VALUES (2), (1), (1), (2), (1);

SELECT a FROM t1 ORDER BY a;

(SELECT a FROM t1) ORDER BY a;

DROP TABLE t1;