bk commit into 5.0 tree (svoj:1.2464)

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
5.0 repository of svoj. When svoj does a push these changes will
be propagated to the main repository and, within 24 hours after the
push, to the public repository.
For information on how to access the public repository
see http://dev.mysql.com/doc/mysql/en/installing-source-tree.html

ChangeSet@stripped, 2007-05-10 18:14:04+05:00, svoj@stripped +3 -0
  Merge mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-4.1-engines
  into  mysql.com:/home/svoj/devel/mysql/BUG27998/mysql-5.0-engines
  MERGE: 1.1616.3023.6

  mysql-test/r/blackhole.result@stripped, 2007-05-10 18:14:02+05:00, svoj@stripped +0 -0
    Manual merge.
    MERGE: 1.2.1.3

  mysql-test/t/blackhole.test@stripped, 2007-05-10 18:14:02+05:00, svoj@stripped +3 -1
    Manual merge.
    MERGE: 1.4.1.1

  sql/ha_blackhole.h@stripped, 2007-05-10 18:07:45+05:00, svoj@stripped +0 -0
    Auto merged
    MERGE: 1.3.1.3

# This is a BitKeeper patch.  What follows are the unified diffs for the
# set of deltas contained in the patch.  The rest of the patch, the part
# that BitKeeper cares about, is below these diffs.
# User:	svoj
# Host:	april.(none)
# Root:	/home/svoj/devel/mysql/BUG27998/mysql-5.0-engines/RESYNC

--- 1.11/mysql-test/r/blackhole.result	2007-05-10 18:14:09 +05:00
+++ 1.12/mysql-test/r/blackhole.result	2007-05-10 18:14:09 +05:00
@@ -123,6 +123,10 @@ master-bin.000001	#	Query	1	#	use `test`
 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);

--- 1.9/mysql-test/t/blackhole.test	2007-05-10 18:14:09 +05:00
+++ 1.10/mysql-test/t/blackhole.test	2007-05-10 18:14:09 +05:00
@@ -128,6 +128,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
 #
 CREATE TABLE t1(a INT, b INT) ENGINE=BLACKHOLE;
@@ -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

--- 1.7/sql/ha_blackhole.h	2007-05-10 18:14:09 +05:00
+++ 1.8/sql/ha_blackhole.h	2007-05-10 18:14:09 +05:00
@@ -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
   {