summaryrefslogtreecommitdiff
path: root/storage/myisammrg
diff options
context:
space:
mode:
authorlars/lthalmann@dl145j.mysql.com <>2007-06-18 09:42:22 +0200
committerlars/lthalmann@dl145j.mysql.com <>2007-06-18 09:42:22 +0200
commitae52876fd04e17bb922759b09ce45e2ecc0e0df0 (patch)
tree5d72c9e47c88d4643b3354241a81f22fda24a3ad /storage/myisammrg
parent7013c96fdf097fa9dc283936b832b3c66df6ac15 (diff)
parent43d419e9a917b316cf1773d82cfaa6dc380574db (diff)
downloadmariadb-git-ae52876fd04e17bb922759b09ce45e2ecc0e0df0.tar.gz
Merge mysql.com:/nfsdisk1/lars/bkroot/mysql-5.1-new-rpl
into mysql.com:/nfsdisk1/lars/MERGE/mysql-5.1-merge
Diffstat (limited to 'storage/myisammrg')
-rw-r--r--storage/myisammrg/ha_myisammrg.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/storage/myisammrg/ha_myisammrg.h b/storage/myisammrg/ha_myisammrg.h
index 88bb5dd2e21..0b9a497bc22 100644
--- a/storage/myisammrg/ha_myisammrg.h
+++ b/storage/myisammrg/ha_myisammrg.h
@@ -35,6 +35,7 @@ class ha_myisammrg: public handler
ulonglong table_flags() const
{
return (HA_REC_NOT_IN_SEQ | HA_AUTO_PART_KEY | HA_NO_TRANSACTIONS |
+ HA_BINLOG_ROW_CAPABLE | HA_BINLOG_STMT_CAPABLE |
HA_NULL_IN_KEY | HA_CAN_INDEX_BLOBS | HA_FILE_BASED |
HA_ANY_INDEX_MAY_BE_UNIQUE | HA_CAN_BIT_FIELD |
HA_NO_COPY_ON_ALTER);