Merge pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build-work

into  pippilotta.erinye.com:/shared/home/df/mysql/build/mysql-5.1-build

mysql-test/t/partition.test

@@ -420,9 +420,13 @@ drop table t1;
 #
 # BUG 14524
 #
+# Disable warnings to allow this test case to work without
+# the Blackhole engine.
+--disable_warnings
 CREATE TABLE `t1` (
   `id` int(11) default NULL
 ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 PARTITION BY HASH (id) ;
+--enable_warnings
 SELECT * FROM t1;
 
 drop table t1;
@@ -430,9 +434,13 @@ drop table t1;
 #
 # BUG 14524
 #
+# Disable warnings to allow this test case to work without
+# the Blackhole engine.
+--disable_warnings
 CREATE TABLE `t1` (
   `id` int(11) default NULL
 ) ENGINE=BLACKHOLE DEFAULT CHARSET=latin1 PARTITION BY HASH (id) ;
+--enable_warnings
 SELECT * FROM t1;
 
 drop table t1;

mysql-test/t/partition_hash.test

@@ -129,7 +129,11 @@ drop table t1;
 #
 # BUG# 14524 Partitions: crash if blackhole
 #
+# Disable warnings to allow this test case to run without 
+# the Blackhole storage engine.
+--disable_warnings
 CREATE TABLE t1 (s1 int) ENGINE=BLACKHOLE PARTITION BY HASH (s1);
+--enable_warnings
 INSERT INTO t1 VALUES (0);
 DROP TABLE t1;