bzr push into mysql-5.1 branch (mats:2687)

[Mats Kindahl]

 2687 Mats Kindahl	2008-10-03 [merge]
      Merging with 5.1-5.1.29-rc.
modified:
  mysql-test/r/func_group.result
  mysql-test/suite/ndb/t/disabled.def
  mysql-test/t/func_group.test
  sql/item.cc
  sql/item.h
  sql/mysqld.cc
  sql/sql_select.cc

=== 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);