bk commit into 6.0 tree (kaa:1.2789)

[Alexey Kopytov]

Below is the list of changes that have just been committed into a local
6.0 repository of kaa.  When kaa 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@stripped, 2008-01-20 14:03:45+03:00, kaa@kaamos.(none) +3 -0
  Post-merge fix after the merge from 5.1 into 6.0.

  mysql-test/r/subselect_no_mat.result@stripped, 2008-01-20 14:03:44+03:00, kaa@kaamos.(none) +1 -1
    Post-merge fix after the merge from 5.1 into 6.0.

  mysql-test/r/subselect_no_opts.result@stripped, 2008-01-20 14:03:44+03:00, kaa@kaamos.(none) +1 -1
    Post-merge fix after the merge from 5.1 into 6.0.

  mysql-test/r/subselect_no_semijoin.result@stripped, 2008-01-20 14:03:44+03:00, kaa@kaamos.(none) +1 -1
    Post-merge fix after the merge from 5.1 into 6.0.

diff -Nrup a/mysql-test/r/subselect_no_mat.result b/mysql-test/r/subselect_no_mat.result
--- a/mysql-test/r/subselect_no_mat.result	2008-01-20 00:02:24 +03:00
+++ b/mysql-test/r/subselect_no_mat.result	2008-01-20 14:03:44 +03:00
@@ -4333,7 +4333,7 @@ GROUP BY a4;
 a4	f3	a6
 1	NULL	NULL
 2	NULL	NULL
-DROP TABLE t1, t2;
+DROP TABLE t1, t2, t3, t4;
 End of 5.0 tests.
 create table t_out (subcase char(3),
 a1 char(2), b1 char(2), c1 char(2));
diff -Nrup a/mysql-test/r/subselect_no_opts.result b/mysql-test/r/subselect_no_opts.result
--- a/mysql-test/r/subselect_no_opts.result	2008-01-20 00:02:24 +03:00
+++ b/mysql-test/r/subselect_no_opts.result	2008-01-20 14:03:44 +03:00
@@ -4333,7 +4333,7 @@ GROUP BY a4;
 a4	f3	a6
 1	NULL	NULL
 2	NULL	NULL
-DROP TABLE t1, t2;
+DROP TABLE t1, t2, t3, t4;
 End of 5.0 tests.
 create table t_out (subcase char(3),
 a1 char(2), b1 char(2), c1 char(2));
diff -Nrup a/mysql-test/r/subselect_no_semijoin.result b/mysql-test/r/subselect_no_semijoin.result
--- a/mysql-test/r/subselect_no_semijoin.result	2008-01-20 00:02:24 +03:00
+++ b/mysql-test/r/subselect_no_semijoin.result	2008-01-20 14:03:44 +03:00
@@ -4333,7 +4333,7 @@ GROUP BY a4;
 a4	f3	a6
 1	NULL	NULL
 2	NULL	NULL
-DROP TABLE t1, t2;
+DROP TABLE t1, t2, t3, t4;
 End of 5.0 tests.
 create table t_out (subcase char(3),
 a1 char(2), b1 char(2), c1 char(2));