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

[Sven Sandberg]

 2685 Sven Sandberg	2008-07-23
      post-merge fix.
      Problem: Perl code in main.maria-recover needed to use
      a variable set by the test. Perl code can't read test
      language variables.
      Fix: make the variable an environment variable.
modified:
  mysql-test/t/maria-recover.test

 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

=== modified file 'mysql-test/t/maria-recover.test'
--- a/mysql-test/t/maria-recover.test	2008-07-22 18:08:06 +0000
+++ b/mysql-test/t/maria-recover.test	2008-07-23 12:27:46 +0000
@@ -2,7 +2,9 @@
 
 --source include/have_maria.inc
 
-let $MYSQLD_DATADIR= `select @@datadir`;
+# Note: we're setting an environment variable (not prefixing it by $),
+# so that the perl code below can access it.
+let MYSQLD_DATADIR= `select @@datadir`;
 
 select @@global.maria_recover;
 set global maria_recover=off;