summaryrefslogtreecommitdiff
path: root/sql
diff options
context:
space:
mode:
authorunknown <svoj@mysql.com/june.mysql.com>2007-05-23 12:38:34 +0500
committerunknown <svoj@mysql.com/june.mysql.com>2007-05-23 12:38:34 +0500
commite5b2adeac1af976323f61700dd00694b9063e17f (patch)
treef3d76e21e36cfecb2630972071b33b496b3477a9 /sql
parent05464a4f457b5167749e67a4951f20dcc2fa196b (diff)
parenta656c71e8ae765ea194a59a69d440d203308f235 (diff)
downloadmariadb-git-e5b2adeac1af976323f61700dd00694b9063e17f.tar.gz
Merge mysql.com:/home/svoj/devel/bk/mysql-4.1
into mysql.com:/home/svoj/devel/mysql/merge/mysql-4.1-engines
Diffstat (limited to 'sql')
-rw-r--r--sql/ha_blackhole.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_blackhole.h b/sql/ha_blackhole.h
index 177b59fa970..e5f5ee69a82 100644
--- a/sql/ha_blackhole.h
+++ b/sql/ha_blackhole.h
@@ -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
{