bk commit into 4.1 tree (sergefp:1.2170)

[Sergey Petrunia]

Below is the list of changes that have just been committed into a local
4.1 repository of psergey. When psergey does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet
  1.2170 05/03/31 20:23:10 sergefp@stripped +2 -0
  Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT 

  mysql-test/t/group_by.test
    1.34 05/03/31 20:23:08 sergefp@stripped +2 -1
    Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT 

  mysql-test/r/group_by.result
    1.44 05/03/31 20:23:08 sergefp@stripped +1 -1
    Make the tests deterministic: change DELETE ... LIMIT to DELETE ... ORDER BY ... LIMIT 

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	sergefp
# Host:	newbox.mylan
# Root:	/home/psergey/mysql-4.1-look100

--- 1.43/mysql-test/r/group_by.result	2005-03-30 15:57:38 +04:00
+++ 1.44/mysql-test/r/group_by.result	2005-03-31 20:23:08 +04:00
@@ -693,7 +693,7 @@
 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

--- 1.33/mysql-test/t/group_by.test	2005-03-30 15:57:38 +04:00
+++ 1.34/mysql-test/t/group_by.test	2005-03-31 20:23:08 +04:00
@@ -508,7 +508,8 @@
    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;