bk commit into 4.1 tree (svoj:1.2649) BUG#27988

[Sergey Vojtovich]

Below is the list of changes that have just been committed into a local
4.1 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-04-28 14:33:46+05:00, svoj@stripped +3 -0
  BUG#27988 - mysqld crashed when executing INSERT DELAYED
              on a BLACKHOLE table
  
  Using INSERT DELAYED on BLACKHOLE tables could lead to server
  crash.
  
  This happens because delayed thread wants to upgrade a lock,
  but BLACKHOLE tables do not have locks at all.
  
  This patch rejects attempts to use INSERT DELAYED on MERGE
  tables.

  mysql-test/r/blackhole.result@stripped, 2007-04-28 14:33:44+05:00, svoj@stripped +4 -0
    A test case for BUG#27998.

  mysql-test/t/blackhole.test@stripped, 2007-04-28 14:33:45+05:00, svoj@stripped +9 -0
    A test case for BUG#27998.

  sql/ha_blackhole.h@stripped, 2007-04-28 14:33:45+05:00, svoj@stripped +1 -2
    Removed HA_CAN_INSERT_DELAYED flag from table_flags().
    The insert delayed thread upgrades the lock. Hence it is
    incapable to handle BLACKHOLE tables, which do not have
    locks at all.

# 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:	june.mysql.com
# Root:	/home/svoj/devel/mysql/BUG27998/mysql-4.1-engines

--- 1.4/mysql-test/r/blackhole.result	2006-05-12 21:26:39 +05:00
+++ 1.5/mysql-test/r/blackhole.result	2007-04-28 14:33:44 +05:00
@@ -123,3 +123,7 @@ 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;

--- 1.4/mysql-test/t/blackhole.test	2005-07-28 05:21:39 +05:00
+++ 1.5/mysql-test/t/blackhole.test	2007-04-28 14:33:45 +05:00
@@ -126,4 +126,13 @@ 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

--- 1.5/sql/ha_blackhole.h	2006-09-28 18:41:33 +05:00
+++ 1.6/sql/ha_blackhole.h	2007-04-28 14:33:45 +05:00
@@ -46,8 +46,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
   {