Commit 201a343a authored by unknown's avatar unknown
Browse files

Merge olga.mysql.com:/home/igor/mysql-4.1-opt 

into  olga.mysql.com:/home/igor/mysql-5.0-opt


mysql-test/r/order_by.result:
  Manual merge
mysql-test/t/order_by.test:
  Manual merge
parents da037917 e488e6f2

mysql-test/r/order_by.result

+25 −0
Original line number Diff line number Diff line
@@ -964,6 +964,31 @@ x1 x2 
	4

1	

2	

SELECT a, a IN (1,2) FROM t1 ORDER BY a IN (1,2);

a	a IN (1,2)

3	0

4	0

2	1

1	1

SELECT a FROM t1 ORDER BY a IN (1,2);

a

3

4

2

1

SELECT a+10 FROM t1 ORDER BY a IN (1,2);

a+10

13

14

12

11

SELECT a, IF(a IN (1,2), a, a+10) FROM t1

ORDER BY IF(a IN (3,4), a, a+10);

a	IF(a IN (1,2), a, a+10)

3	13

4	14

1	1

2	2

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);

mysql-test/t/order_by.test

+6 −0
Original line number Diff line number Diff line
@@ -658,6 +658,12 @@ SELECT IF(a IN (1,2), a, '') as x1, IF(a NOT IN (1,2), a, '') as x2 
SELECT IF(a IN (1,2), a, '') as x1, IF(a NOT IN (1,2), a, '') as x2

  FROM t1 GROUP BY x1, IF(a NOT IN (1,2), a, '');



# The remaining queries are for better coverage

SELECT a, a IN (1,2) FROM t1 ORDER BY a IN (1,2);

SELECT a FROM t1 ORDER BY a IN (1,2);

SELECT a+10 FROM t1 ORDER BY a IN (1,2);

SELECT a, IF(a IN (1,2), a, a+10) FROM t1

  ORDER BY IF(a IN (3,4), a, a+10);   

DROP TABLE t1;



# End of 4.1