diff options
author | unknown <sergefp@mysql.com> | 2005-03-31 20:23:10 +0400 |
---|---|---|
committer | unknown <sergefp@mysql.com> | 2005-03-31 20:23:10 +0400 |
commit | 26bb934313de62ca2e2d55fd460c117c6f7a83e8 (patch) | |
tree | a0d76530275feb59f9afc8e2ef95521c903b1530 /mysql-test | |
parent | 11b64a4ec964bf252b2e26261edd376a5f1d3a0c (diff) | |
download | mariadb-git-26bb934313de62ca2e2d55fd460c117c6f7a83e8.tar.gz |
Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT
Diffstat (limited to 'mysql-test')
-rw-r--r-- | mysql-test/r/group_by.result | 2 | ||||
-rw-r--r-- | mysql-test/t/group_by.test | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/mysql-test/r/group_by.result b/mysql-test/r/group_by.result index e4904bb7a04..a8766907fa5 100644 --- a/mysql-test/r/group_by.result +++ b/mysql-test/r/group_by.result @@ -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 diff --git a/mysql-test/t/group_by.test b/mysql-test/t/group_by.test index 327be1b724b..46e58cd00fd 100644 --- a/mysql-test/t/group_by.test +++ b/mysql-test/t/group_by.test @@ -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; |