bzr push into mysql-6.0 branch (mats:2690 to 2691)

[Mats Kindahl]

 2691 Mats Kindahl	2008-09-09
      Adding missing backup test directories to distribution
      causing test failure in pushbuild.
modified:
  mysql-test/Makefile.am

 2690 Mats Kindahl	2008-09-09
      Fixing test failure for rpl000017.
modified:
  mysql-test/include/master-slave-reset.inc
  mysql-test/include/master-slave.inc
  mysql-test/include/wait_for_slave_param.inc
  mysql-test/suite/rpl/r/rpl000017.result
  mysql-test/suite/rpl/t/rpl000017.test

=== modified file 'mysql-test/Makefile.am'
--- a/mysql-test/Makefile.am	2008-09-07 11:04:07 +0000
+++ b/mysql-test/Makefile.am	2008-09-09 11:03:39 +0000
@@ -62,7 +62,7 @@ TEST_DIRS = t r include std_data std_dat
 	std_data/ndb_backup51_data_be std_data/ndb_backup51_data_le \
         std_data/ndb_backup51_d2_be std_data/ndb_backup51_d2_le \
 	extra/binlog_tests/ extra/rpl_tests \
-	suite/backup suite/backup/t suite/backup/r \
+	suite/backup suite/backup/t suite/backup/r suite/backup/include \
 	suite/binlog suite/binlog/t suite/binlog/r suite/binlog/std_data \
 	suite/bugs/data suite/bugs/t suite/bugs/r \
 	suite/federated \