bzr commit into mysql-5.1 branch (sergefp:2710)

[Sergey Petrunia]

#At file:///home/psergey/dev/mysql-5.1-bugteam-fixes/

 2710 Sergey Petrunia	2008-08-20
      Fix others' merge error in federated.{test,result}
modified:
  mysql-test/r/federated.result
  mysql-test/t/federated.test

per-file messages:
  mysql-test/r/federated.result
    Fix others' merge error in federated.{test,result}
  mysql-test/t/federated.test
    Fix others' merge error in federated.{test,result}
=== modified file 'mysql-test/r/federated.result'
--- a/mysql-test/r/federated.result	2008-08-15 19:30:17 +0000
+++ b/mysql-test/r/federated.result	2008-08-20 00:34:52 +0000
@@ -2121,7 +2121,6 @@ DROP TABLE t1;
 CREATE TABLE t1 (a LONGBLOB, b LONGBLOB);
 INSERT INTO t1 VALUES ('aaaaaaaaaaaaaaaaaaaaaaaaaaaa', NULL);
 CREATE TABLE t1
-
 (a LONGBLOB, b LONGBLOB) ENGINE=FEDERATED
 CONNECTION='mysql://root@stripped:SLAVE_PORT/test/t1';
 CHECKSUM TABLE t1;
@@ -2129,11 +2128,11 @@ Table	Checksum
 test.t1	2465757603
 DROP TABLE t1;
 DROP TABLE t1;
-DROP TABLE IF EXISTS federated.t1;
-DROP DATABASE IF EXISTS federated;
-DROP TABLE IF EXISTS federated.t1;
-DROP DATABASE IF EXISTS federated;
 End of 5.0 tests
 create server 's1' foreign data wrapper 'mysql' options (port 3306);
 drop server 's1';
 End of 5.1 tests
+DROP TABLE IF EXISTS federated.t1;
+DROP DATABASE IF EXISTS federated;
+DROP TABLE IF EXISTS federated.t1;
+DROP DATABASE IF EXISTS federated;

=== modified file 'mysql-test/t/federated.test'
--- a/mysql-test/t/federated.test	2008-08-15 19:30:17 +0000
+++ b/mysql-test/t/federated.test	2008-08-20 00:34:52 +0000
@@ -1882,5 +1882,6 @@ connection default;
 
 create server 's1' foreign data wrapper 'mysql' options (port 3306);
 drop server 's1';
+
 --echo End of 5.1 tests
 source include/federated_cleanup.inc;