bzr commit into mysql-5.1 branch (mats:2686)

[Mats Kindahl]

#At file:///home/bzr/bugs/b38360-5.1-5.1-29-rc/

 2686 Mats Kindahl	2008-10-03
      The test rpl_blackhole was executed even when
      there were no blackhole installed. This patch
      adds a check for that.
modified:
  mysql-test/suite/rpl/t/rpl_blackhole.test

per-file messages:
  mysql-test/suite/rpl/t/rpl_blackhole.test
    Adding include of have_blackhole.
=== modified file 'mysql-test/suite/rpl/t/rpl_blackhole.test'
--- a/mysql-test/suite/rpl/t/rpl_blackhole.test	2008-10-02 19:13:15 +0000
+++ b/mysql-test/suite/rpl/t/rpl_blackhole.test	2008-10-03 10:52:01 +0000
@@ -1,5 +1,3 @@
---source include/master-slave.inc
-
 # PURPOSE. Test that blackhole works with replication in all three
 # modes: STATEMENT, MIXED, and ROW.
 #
@@ -17,6 +15,9 @@
 # primary key lookup), and index/key with multiple matches (forcing an
 # index search).
 
+source include/master-slave.inc;
+source include/have_blackhole.inc;
+
 # We start with no primary key
 CREATE TABLE t1 (a INT, b INT, c INT);
 CREATE TABLE t2 (a INT, b INT, c INT);