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

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


sql/ha_blackhole.h:
  Auto merged
mysql-test/r/blackhole.result:
  Manual merge.
mysql-test/t/blackhole.test:
  Manual merge.

mysql-test/r/blackhole.result

@@ -123,6 +123,10 @@ master-bin.000001	#	Query	1	#	use `test`; create table t3 like t1
 master-bin.000001	#	Query	1	#	use `test`; insert into t1 select * from t3
 master-bin.000001	#	Query	1	#	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);
+ERROR HY000: Table storage engine for 't1' doesn't have this option
+DROP TABLE t1;
 CREATE TABLE t1(a INT, b INT) ENGINE=BLACKHOLE;
 DELETE FROM t1 WHERE a=10;
 ALTER TABLE t1 ADD INDEX(a);

mysql-test/t/blackhole.test

@@ -127,6 +127,17 @@ show binlog events;
 
 drop table t1,t2,t3;
 
+#
+# BUG#27998 - mysqld crashed when executing INSERT DELAYED on a BLACKHOLE
+#             table
+#
+CREATE TABLE t1(a INT) ENGINE=BLACKHOLE;
+--error 1031
+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
 #
@@ -142,4 +153,4 @@ 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

sql/ha_blackhole.h

@@ -43,8 +43,7 @@ public:
   {
     return(HA_NULL_IN_KEY | HA_CAN_FULLTEXT | HA_CAN_SQL_HANDLER |
            HA_DUPP_POS | HA_CAN_INDEX_BLOBS | HA_AUTO_PART_KEY |
-           HA_FILE_BASED | HA_CAN_GEOMETRY | HA_READ_RND_SAME |
-           HA_CAN_INSERT_DELAYED);
+           HA_FILE_BASED | HA_CAN_GEOMETRY | HA_READ_RND_SAME);
   }
   ulong index_flags(uint inx, uint part, bool all_parts) const
   {