summaryrefslogtreecommitdiff
path: root/sql/ha_myisammrg.h
diff options
context:
space:
mode:
authoristruewing@chilla.local <>2007-03-06 10:34:14 +0100
committeristruewing@chilla.local <>2007-03-06 10:34:14 +0100
commit7cb031a010072b81774f7268130dd99ebaa88279 (patch)
tree38bd31c78f1f089fbbc3b41296274ec6a1cdb3ea /sql/ha_myisammrg.h
parentaae6e1aba44e2d8353ccb111633bc3631eefaf7a (diff)
parent629fed6c4d2dcb8e062de7bee959e38d434d5c67 (diff)
downloadmariadb-git-7cb031a010072b81774f7268130dd99ebaa88279.tar.gz
Merge chilla.local:/home/mydev/mysql-4.1-bug26464
into chilla.local:/home/mydev/mysql-5.0-bug26464
Diffstat (limited to 'sql/ha_myisammrg.h')
-rw-r--r--sql/ha_myisammrg.h3
1 files changed, 1 insertions, 2 deletions
diff --git a/sql/ha_myisammrg.h b/sql/ha_myisammrg.h
index e546dfee699..16c734e2682 100644
--- a/sql/ha_myisammrg.h
+++ b/sql/ha_myisammrg.h
@@ -36,8 +36,7 @@ class ha_myisammrg: public handler
{
return (HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_READ_RND_SAME |
HA_NULL_IN_KEY | HA_CAN_INDEX_BLOBS | HA_FILE_BASED |
- HA_CAN_INSERT_DELAYED | HA_ANY_INDEX_MAY_BE_UNIQUE |
- HA_CAN_BIT_FIELD);
+ HA_ANY_INDEX_MAY_BE_UNIQUE | HA_CAN_BIT_FIELD);
}
ulong index_flags(uint inx, uint part, bool all_parts) const
{