bzr push into mysql-6.0-backup branch (sven:2683 to 2684)

[Sven Sandberg]

 2684 Sven Sandberg	2008-07-23
      post-merge fixes. have_federated.inc was moved. updated
      tests that do 'source have_federated.inc' to use the
      new location.
modified:
  mysql-test/suite/federated/federated.inc
  mysql-test/t/partition_federated.test

 2683 Sven Sandberg	2008-07-23
      Post-merge fixes.
      mysql-test/suite/backup was not listed among the files
      to include in the distribution, causing pb to fail.
modified:
  mysql-test/Makefile.am

=== modified file 'mysql-test/suite/federated/federated.inc'
--- a/mysql-test/suite/federated/federated.inc	2008-03-10 11:54:15 +0000
+++ b/mysql-test/suite/federated/federated.inc	2008-07-23 12:03:59 +0000
@@ -1,5 +1,5 @@
 --source include/not_embedded.inc
---source have_federated_db.inc
+--source include/have_federated_db.inc
 
 connect (master,127.0.0.1,root,,test,$MASTER_MYPORT,);
 connect (slave,127.0.0.1,root,,test,$SLAVE_MYPORT,);

=== modified file 'mysql-test/t/partition_federated.test'
--- a/mysql-test/t/partition_federated.test	2007-12-12 17:19:24 +0000
+++ b/mysql-test/t/partition_federated.test	2008-07-23 12:03:59 +0000
@@ -3,7 +3,7 @@
 #
 -- source include/have_partition.inc
 -- source include/not_embedded.inc
--- source suite/federated/have_federated_db.inc
+-- source include/have_federated_db.inc
 
 --disable_warnings
 drop table if exists t1;