Commit 26bb9343 authored by unknown's avatar unknown
Browse files

Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT

parent 11b64a4e

mysql-test/r/group_by.result

+1 −1
Original line number Diff line number Diff line
@@ -693,7 +693,7 @@ concat('val-', x3.a + 3*x4.a), -- 12 
concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120

concat('val-', @a + 120*D.a)

from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4;

delete from t2  where a = 2 and b = 'val-2' limit 30;

delete from t2  where a = 2 and b = 'val-2' order by a,b,c,d limit 30;

explain select c from t2 where a = 2 and b = 'val-2' group by c;

id	select_type	table	type	possible_keys	key	key_len	ref	rows	Extra

1	SIMPLE	t2	ref	PRIMARY,a	PRIMARY	400	const,const	6	Using where

mysql-test/t/group_by.test

+2 −1
Original line number Diff line number Diff line
@@ -508,7 +508,8 @@ insert into t2 select 
   concat('val-', @a:=x3.a + 3*x4.a + 12*C.a), -- 120

   concat('val-', @a + 120*D.a)

from t1 x3, t1 x4, t1 C, t1 D where x3.a < 3 and x4.a < 4 and D.a < 4;

delete from t2  where a = 2 and b = 'val-2' limit 30;



delete from t2  where a = 2 and b = 'val-2' order by a,b,c,d limit 30;



explain select c from t2 where a = 2 and b = 'val-2' group by c;

select c from t2 where a = 2 and b = 'val-2' group by c;