Merge mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-5.0-engines

into  mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-5.1-engines


storage/blackhole/ha_blackhole.h:
  Use local.
mysql-test/extra/binlog_tests/blackhole.test:
  Manual merge.
mysql-test/r/binlog_stm_blackhole.result:
  Manual merge.

mysql-test/extra/binlog_tests/blackhole.test

@@ -124,6 +124,16 @@ let $VERSION=`select version()`;
 source include/show_binlog_events.inc;
 drop table t1,t2,t3;
 
+#
+# BUG#27998 - mysqld crashed when executing INSERT DELAYED on a BLACKHOLE
+#             table
+#
+CREATE TABLE t1(a INT) ENGINE=BLACKHOLE;
+INSERT DELAYED INTO t1 VALUES(1);
+DROP TABLE t1;
+
+# End of 4.1 tests
+
 #
 #Bug#19717: DELETE Query Error on BLACKHOLE when using WHERE on column with UNIQUE INDEX
 #
@@ -139,7 +149,8 @@ ALTER TABLE t1 ADD PRIMARY KEY(a);
 DELETE FROM t1 WHERE a=10;
 DROP TABLE t1;
 
-# End of 4.1 tests
+# End of 5.0 tests
+
 # Test that a transaction which is rolled back does not go into binlog
 # and that a transaction which is committed does
 
@@ -156,4 +167,4 @@ set autocommit=1;
 source include/show_binlog_events.inc;
 drop table if exists t1;
 
-# End of 5.0 tests
+# End of 5.1 tests

mysql-test/r/binlog_stm_blackhole.result

@@ -122,6 +122,9 @@ master-bin.000001	#	Query	#	#	use `test`; create table t3 like t1
 master-bin.000001	#	Query	#	#	use `test`; insert into t1 select * from t3
 master-bin.000001	#	Query	#	#	use `test`; replace into t1 select * from t3
 drop table t1,t2,t3;
+CREATE TABLE t1(a INT) ENGINE=BLACKHOLE;
+INSERT DELAYED INTO t1 VALUES(1);
+DROP TABLE t1;
 CREATE TABLE t1(a INT, b INT) ENGINE=BLACKHOLE;
 DELETE FROM t1 WHERE a=10;
 ALTER TABLE t1 ADD INDEX(a);