bk commit into 5.1 tree (holyfoot:1.2663)

[holyfoot]

Below is the list of changes that have just been committed into a local
5.1 repository of hf. When hf 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, 2007-12-01 13:07:28+04:00, holyfoot@stripped +1 -0
  merging

  mysql-test/r/federated.result@stripped, 2007-12-01 13:07:25+04:00, holyfoot@stripped +1 -1
    merging

diff -Nrup a/mysql-test/r/federated.result b/mysql-test/r/federated.result
--- a/mysql-test/r/federated.result	2007-12-01 00:44:29 +04:00
+++ b/mysql-test/r/federated.result	2007-12-01 13:07:25 +04:00
@@ -1955,7 +1955,6 @@ a
 2
 DROP TABLE federated.t1;
 DROP TABLE federated.t1;
-End of 5.1 tests
 create table t1 (a varchar(256));
 drop view if exists v1;
 create view v1 as select a from t1;
@@ -2067,6 +2066,7 @@ select 1 from t1 order by a;
 drop table t1;
 drop table t1;
 drop view v1;
+End of 5.1 tests
 DROP TABLE IF EXISTS federated.t1;
 DROP DATABASE IF EXISTS federated;
 DROP TABLE IF EXISTS federated.t1;