bk commit into 5.1 tree (vtkachenko:1.1887)

[Vadim Tkachenko]

Below is the list of changes that have just been committed into a local
5.1 repository of vtkachenko. When vtkachenko 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.1887 05/06/17 19:54:13 vtkachenko@stripped +2 -0
  subselect.test:
    fix rows order
  view.test:
    Fix rows order

  mysql-test/t/subselect.test
    1.101 05/06/17 19:52:45 vtkachenko@stripped +1 -1
    fix rows order

  mysql-test/t/view.test
    1.71 05/06/17 19:52:21 vtkachenko@stripped +2 -2
    Fix rows order

# 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:	vtkachenko
# Host:	melody.mysql.com
# Root:	/users/vtkachenko/bk/mysql-5.1

--- 1.100/mysql-test/t/subselect.test	2005-05-20 15:31:43 +02:00
+++ 1.101/mysql-test/t/subselect.test	2005-06-17 19:52:45 +02:00
@@ -1377,7 +1377,7 @@
 insert into t1 (b) values ('ball'),('ball games'), ('games'), ('foo'), ('foobar'), ('Serg'), ('Sergei'),('Georg'), ('Patrik'),('Hakan'); 
 create table t2 (a int); 
 insert into t2 values (1),(3),(2),(7); 
-select a,b from t1 where match(b) against ('Ball') > 0; 
+select a,b from t1 where match(b) against ('Ball') > 0 order by a; 
 select a from t2 where a in (select a from t1 where match(b) against ('Ball') > 0); 
 drop table t1,t2;
 

--- 1.70/mysql-test/t/view.test	2005-05-17 17:05:06 +02:00
+++ 1.71/mysql-test/t/view.test	2005-06-17 19:52:21 +02:00
@@ -651,9 +651,9 @@
 #
 CREATE TABLE t1 (c1 int not null auto_increment primary key, c2 varchar(20), fulltext(c2));
 insert into t1 (c2) VALUES ('real Beer'),('Water'),('Kossu'),('Coca-Cola'),('Vodka'),('Wine'),('almost real Beer');
-select * from t1 WHERE match (c2) against ('Beer');
+select * from t1 WHERE match (c2) against ('Beer') order by c1;
 CREATE VIEW v1 AS SELECT  * from t1 WHERE match (c2) against ('Beer');
-select * from v1;
+select * from v1 order by c1;
 drop view v1;
 drop table t1;